From 3909cd0ef42cdb739cdb50bcef0ec8ba7b1d4fd7 Mon Sep 17 00:00:00 2001 From: anquetil Date: Wed, 24 Jun 2026 16:33:12 +0200 Subject: [PATCH 1/2] removing dead methods from corese.core.sparql --- .../corese/core/sparql/api/IDatatype.java | 10 - .../core/sparql/compiler/java/Datatype.java | 9 - .../sparql/compiler/java/JavaCompiler.java | 56 ---- .../core/sparql/datatype/CoreseBoolean.java | 9 - .../core/sparql/datatype/CoreseCalendar.java | 51 ---- .../core/sparql/datatype/CoreseDatatype.java | 7 - .../core/sparql/datatype/CoreseDate.java | 3 - .../core/sparql/datatype/CoreseDecimal.java | 11 - .../core/sparql/datatype/CoreseFloat.java | 4 - .../core/sparql/datatype/CoreseInteger.java | 26 -- .../core/sparql/datatype/CoreseString.java | 3 - .../sparql/datatype/CoreseStringBuilder.java | 7 - .../sparql/datatype/CoreseStringLiteral.java | 6 - .../sparql/datatype/CoreseStringableImpl.java | 19 -- .../sparql/datatype/CoreseURILiteral.java | 4 - .../core/sparql/datatype/DatatypeMap.java | 147 ----------- .../datatype/extension/CoreseIterate.java | 3 - .../sparql/datatype/extension/CoreseJSON.java | 13 - .../sparql/datatype/extension/CoreseList.java | 22 -- .../sparql/datatype/extension/CoreseMap.java | 16 -- .../datatype/extension/CoresePointer.java | 18 -- .../sparql/datatype/extension/CoreseXML.java | 9 - .../core/sparql/datatype/function/SQLFun.java | 20 -- .../datatype/function/StringHelper.java | 241 +----------------- .../sparql/datatype/function/XPathFun.java | 7 - .../sparql/exceptions/CompileException.java | 3 - .../sparql/exceptions/CoreseException.java | 19 -- .../sparql/exceptions/EngineException.java | 10 - .../sparql/exceptions/LDScriptException.java | 4 - .../sparql/exceptions/SQLFunException.java | 8 - .../sparql/exceptions/SafetyException.java | 3 - .../core/sparql/storage/fs/FileHandler.java | 8 - .../core/sparql/storage/fs/StringMeta.java | 16 -- .../sparql/storage/util/StorageFactory.java | 9 - .../triple/function/extension/GetGen.java | 9 - .../triple/function/extension/ZeroAry.java | 3 - .../triple/function/script/Extension.java | 47 ---- .../triple/function/script/Function.java | 23 -- .../triple/function/script/JavaFunction.java | 6 - .../triple/function/script/LDScript.java | 13 - .../sparql/triple/function/script/Let.java | 5 - .../triple/function/script/MapAnyEvery.java | 106 -------- .../triple/function/script/MapFunction.java | 23 -- .../triple/function/script/Statement.java | 4 - .../function/template/TemplateFunction.java | 9 - .../sparql/triple/function/term/Binding.java | 54 ---- .../sparql/triple/function/term/DivTerm.java | 3 - .../core/sparql/triple/function/term/EQ.java | 3 - .../core/sparql/triple/function/term/GE.java | 3 - .../core/sparql/triple/function/term/GT.java | 3 - .../core/sparql/triple/function/term/LE.java | 3 - .../core/sparql/triple/function/term/LT.java | 3 - .../triple/function/term/MinusTerm.java | 3 - .../sparql/triple/function/term/MultTerm.java | 3 - .../core/sparql/triple/function/term/NEQ.java | 3 - .../sparql/triple/function/term/NotTerm.java | 4 - .../sparql/triple/function/term/PlusTerm.java | 3 - .../sparql/triple/function/term/TermEval.java | 11 - .../triple/javacc1/JavaccParseException.java | 7 - .../core/sparql/triple/parser/ASTBuffer.java | 3 - .../sparql/triple/parser/ASTExtension.java | 60 ----- .../core/sparql/triple/parser/ASTFactory.java | 13 - .../core/sparql/triple/parser/ASTPrinter.java | 7 - .../sparql/triple/parser/ASTSelector.java | 6 - .../sparql/triple/parser/ASTTemplate.java | 26 -- .../core/sparql/triple/parser/Access.java | 87 ------- .../sparql/triple/parser/AccessNamespace.java | 7 - .../sparql/triple/parser/AccessRight.java | 122 --------- .../triple/parser/AccessRightDefinition.java | 66 ----- .../corese/core/sparql/triple/parser/And.java | 10 - .../core/sparql/triple/parser/Atom.java | 19 -- .../triple/parser/BasicGraphPattern.java | 63 ----- .../core/sparql/triple/parser/Constant.java | 36 --- .../core/sparql/triple/parser/Context.java | 222 +--------------- .../core/sparql/triple/parser/Dataset.java | 73 ------ .../corese/core/sparql/triple/parser/Exp.java | 46 ---- .../core/sparql/triple/parser/Expression.java | 78 ------ .../sparql/triple/parser/ExpressionList.java | 13 - .../sparql/triple/parser/ExtractList.java | 10 - .../sparql/triple/parser/HashMapList.java | 7 - .../core/sparql/triple/parser/Join.java | 6 - .../core/sparql/triple/parser/LoadTurtle.java | 23 -- .../core/sparql/triple/parser/Metadata.java | 67 ----- .../core/sparql/triple/parser/NSManager.java | 128 ---------- .../core/sparql/triple/parser/Optional.java | 6 - .../sparql/triple/parser/ParserHandler.java | 12 - .../sparql/triple/parser/ParserSparql1.java | 3 - .../core/sparql/triple/parser/Processor.java | 54 ---- .../core/sparql/triple/parser/RDFList.java | 10 - .../core/sparql/triple/parser/Scope.java | 4 - .../core/sparql/triple/parser/Score.java | 23 -- .../core/sparql/triple/parser/Service.java | 8 - .../core/sparql/triple/parser/Source.java | 6 - .../core/sparql/triple/parser/SourceExp.java | 3 - .../core/sparql/triple/parser/Term.java | 31 --- .../core/sparql/triple/parser/TopExp.java | 19 -- .../core/sparql/triple/parser/Triple.java | 192 -------------- .../core/sparql/triple/parser/URLServer.java | 36 --- .../core/sparql/triple/parser/Union.java | 3 - .../core/sparql/triple/parser/Values.java | 14 - .../core/sparql/triple/parser/Variable.java | 20 -- .../sparql/triple/parser/VariableScope.java | 7 - .../triple/parser/context/ContextLog.java | 116 --------- .../parser/context/LinkedResultLog.java | 34 --- .../triple/parser/context/PropertyMap.java | 3 - .../triple/parser/context/SubjectMap.java | 3 - .../triple/parser/visitor/ASTParser.java | 9 - .../visitor/ExpressionVisitorVariable.java | 6 - .../sparql/triple/parser/visitor/Record.java | 6 - .../core/sparql/triple/printer/SPIN.java | 13 - .../core/sparql/triple/update/ASTUpdate.java | 3 - .../core/sparql/triple/update/Basic.java | 9 - .../core/sparql/triple/update/Composite.java | 7 - .../core/sparql/triple/update/Update.java | 11 - 114 files changed, 3 insertions(+), 3021 deletions(-) mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/datatype/CoreseBoolean.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/datatype/CoreseCalendar.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDatatype.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDecimal.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/datatype/CoreseFloat.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/datatype/CoreseInteger.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/datatype/CoreseString.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/datatype/CoreseStringLiteral.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/datatype/CoreseStringableImpl.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeMap.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseList.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/datatype/function/SQLFun.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/datatype/function/XPathFun.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/triple/function/script/Statement.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/triple/parser/And.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/triple/parser/Atom.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/triple/parser/BasicGraphPattern.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/triple/parser/Constant.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/triple/parser/Exp.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/triple/parser/Expression.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/triple/parser/ExpressionList.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/triple/parser/NSManager.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/triple/parser/Optional.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/triple/parser/Processor.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/triple/parser/Scope.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/triple/parser/Score.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/triple/parser/Source.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/triple/parser/Term.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/triple/parser/TopExp.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/triple/parser/Triple.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/triple/parser/Union.java mode change 100755 => 100644 src/main/java/fr/inria/corese/core/sparql/triple/parser/Variable.java 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..a7470762e 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 @@ -202,9 +202,6 @@ default IDatatype set(String name, double value) { return set(DatatypeMap.key(name), DatatypeMap.newInstance(value)); } - default IDatatype set(String name, boolean value) { - return set(DatatypeMap.key(name), DatatypeMap.newInstance(value)); - } /** * this datatype: iterable of json (or map) @@ -362,13 +359,6 @@ default boolean isTripleWithEdge() { String toSparql(boolean prefix, boolean xsd, boolean skipUndefPrefix, NSManager nsm); - default String trace() { - return String.format("trace: %s code: %s datatype: %s label: %s", - this, - getCode(), - getDatatypeURI(), - getLabel()); - } // Used by XMLLiteral to store a XML DOM @Override diff --git a/src/main/java/fr/inria/corese/core/sparql/compiler/java/Datatype.java b/src/main/java/fr/inria/corese/core/sparql/compiler/java/Datatype.java index 4dc2135bd..fc37762cf 100644 --- a/src/main/java/fr/inria/corese/core/sparql/compiler/java/Datatype.java +++ b/src/main/java/fr/inria/corese/core/sparql/compiler/java/Datatype.java @@ -148,9 +148,6 @@ String clean(String str) { return str.replace("\\$", "\\\\$").replace("\\\n", " "); } - String stringasdt(String str) { - return string(DatatypeMap.newInstance(str)); - } String variable(String str) { return string(DatatypeMap.newInstance(str)); @@ -198,9 +195,6 @@ String newLiteral(IDatatype dt) { } } - String newInstance(int val) { - return newInteger(val); - } String newInteger(long val) { switch ((int) val) { @@ -244,9 +238,6 @@ String newInstance(float val) { return String.format("DatatypeMap.newFloat(%s)", val); } - String newInstance(long val) { - return String.format("DatatypeMap.newLong(%s)", val); - } String newInstance(boolean val) { if (val) { 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..f1292d808 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 @@ -69,13 +69,6 @@ public JavaCompiler() { init(); } - /** - * target Java class name - */ - public JavaCompiler(String name) { - this(); - record(name); - } @Override @@ -83,28 +76,6 @@ public String toString() { return sb.toString(); } - /** - * Main function to compile AST functions - */ - public JavaCompiler compile(ASTQuery ast) throws IOException, EngineException { - this.ast = ast; - path(ast); - head.process(getPackage(), name); - compile(ast.getDefine()); - compile(ast.getDefineLambda()); - trailer(); - write(); - return this; - } - - public JavaCompiler compile(Query q) throws IOException { - this.ast = q.getAST(); - path(ast); - head.process(getPackage(), name); - trailer(); - write(); - return this; - } public void compile(ASTExtension ext) throws EngineException { for (Function exp : ext.getFunctionList()) { @@ -408,9 +379,6 @@ void map(Term term) { } } - String javaName(String name) { - return NSManager.nstrip(name); - } String mapName(Term term) { switch (term.oper()) { @@ -690,13 +658,6 @@ void defineTermName() { define(OR, "||"); } - /** - * Java name in let (select where) in function - * sh:path() -> jc:sh_path() - */ - public void setJavaName(String name, String java) { - javaName.put(name, java); - } public String getJavaName(String name) { return javaName.get(name); @@ -765,10 +726,6 @@ void init() { defineTermName(); } - boolean skip(String name) { - Boolean b = skip.get(name); - return b != null && b; - } void path(ASTQuery ast) { if (ast.hasMetadata(Metadata.Type.PATH)) { @@ -863,19 +820,6 @@ StringBuilder append(String str) { return sb; } - /** - * @return the function - */ - public Function getFunction() { - return function; - } - - /** - * @param function the function to set - */ - public void setFunction(Function function) { - this.function = function; - } /** * @return the current diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseBoolean.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseBoolean.java old mode 100755 new mode 100644 index d56e8e354..abf6a03a1 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseBoolean.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseBoolean.java @@ -129,15 +129,6 @@ public static String getNormalizedLabel(String label) { } } - public static String getNormalizedLabel2(String label) { - if (label.equals(STRUE) || label.equals("1")) { - return STRUE; - } else if (label.equals(SFALSE) || label.equals("0")) { - return SFALSE; - } else { - return null; - } - } @Override public boolean equalsWE(IDatatype iod) throws CoreseDatatypeException { diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseCalendar.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseCalendar.java old mode 100755 new mode 100644 index 3a6b34fb2..6ad815e42 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseCalendar.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseCalendar.java @@ -31,9 +31,6 @@ public class CoreseCalendar extends GregorianCalendar { CoreseCalendar() { } - CoreseCalendar(int yy, int mm, int dd) { - super(yy, mm, dd); - } CoreseCalendar(int yy, int mm, int dd, int hh, int min, int ss) { super(yy, mm, dd, hh, min, ss); @@ -44,68 +41,20 @@ public CoreseCalendar duplicate() { // return (CoreseCalendar) clone(); } - public CoreseCalendar duplicate(String tz) { - CoreseCalendar cal = duplicate(); - cal.setTimeZone(TimeZone.getTimeZone("GMT" + tz)); - cal.setDZone(tz); - cal.setZ(cal.getRawOffset() == 0); - return cal; - } public int getRawOffset() { return getTimeZone().getRawOffset(); } - boolean sameDate(CoreseCalendar cal) { - return get(YEAR) == cal.get(YEAR) && get(MONTH) == cal.get(MONTH) && get(DAY_OF_MONTH) == cal.get(DAY_OF_MONTH); - } void setZ(boolean z) { this.Z = z; } - boolean getZ() { - return Z; - } void setDZone(String z) { this.zone = z; } - String getDZone() { - return zone; - } - - float getSeconds() { - int sec = this.get(Calendar.SECOND); - int mill_sec = this.get(Calendar.MILLISECOND); - return sec + (mill_sec / 1000f); - } - - /** - * 1 BC -> -1 - * 2 BC -> -2 - */ - int theYear() { - int year = get(GregorianCalendar.YEAR); - if (get(GregorianCalendar.ERA) == GregorianCalendar.BC) { - year = -year; - } - return year; - } - - /** - * @return the bzone - */ - public boolean isZone() { - return bzone; - } - - /** - * @param bzone the bzone to set - */ - public void setZone(boolean bzone) { - this.bzone = bzone; - } } 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 old mode 100755 new mode 100644 index c60da9b80..1fa9dbb2f --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDatatype.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDatatype.java @@ -98,10 +98,6 @@ public static IDatatype getGenericDatatype(String uri) { return dt; } - @Deprecated - public static IDatatype create(String valueJType, String label) throws CoreseDatatypeException { - return create(valueJType, null, label, null); - } /** * Create a datatype. If it is a not well formed number, create a @@ -1242,9 +1238,6 @@ public IDatatype getObjectDatatypeValue() { return this; } - public boolean isPath() { - return false; - } /** * ************************************************************** diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDate.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDate.java index 773bfdac6..dbbe6eb77 100644 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDate.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDate.java @@ -39,9 +39,6 @@ public CoreseDate(String label) { } } - public static CoreseDate today() { - return new CoreseDate(TODAY); - } @Override public IDatatype.Datatype getCode() { diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDecimal.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDecimal.java old mode 100755 new mode 100644 index b05066730..29891f03a --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDecimal.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDecimal.java @@ -74,13 +74,6 @@ public static CoreseDecimal create(BigDecimal value) { return new CoreseDecimal(value); } - public static CoreseDecimal create(int value) { - return new CoreseDecimal(value); - } - - public static CoreseDecimal create(String value) throws CoreseDatatypeException { - return new CoreseDecimal(value); - } @Override public void setValue(double value) { @@ -121,10 +114,6 @@ public IDatatype.Datatype getCode() { return code; } - @Override - public boolean isDecimal() { - return true; - } @Override public BigDecimal decimalValue() { diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseFloat.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseFloat.java old mode 100755 new mode 100644 index c26796fd8..27449a2a8 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseFloat.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseFloat.java @@ -54,9 +54,5 @@ public IDatatype.Datatype getCode(){ return code; } - @Override - public boolean isFloat(){ - return true; - } } diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseInteger.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseInteger.java old mode 100755 new mode 100644 index 5db261358..3747fc14a --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseInteger.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseInteger.java @@ -335,28 +335,6 @@ public IDatatype ge(IDatatype dt) { // } // // @Override -// public IDatatype minus(IDatatype dt) { -// switch (dt.getCode()) { -// case DOUBLE: -// return CoreseDouble.create(doubleValue() - dt.doubleValue()); -// case FLOAT: -// return new CoreseFloat(floatValue() - dt.floatValue()); -// case DECIMAL: -// return CoreseDecimal.create(doubleValue() - dt.doubleValue()); -// case INTEGER: -// try { -// return CoreseInteger.create(Math.subtractExact(longValue(), dt.longValue())); -// } catch (ArithmeticException e) { -// return null; -// } -// } -// return null; -// } - - @Override - public IDatatype minus(long val) { - return CoreseInteger.create(longValue() - val); - } @Override public String getLowerCaseLabel() { @@ -373,8 +351,4 @@ public String getLabel() { return str; } - @Override - public boolean isInteger() { - return true; - } } diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseString.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseString.java old mode 100755 new mode 100644 index 1b603d11c..53dc9d331 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseString.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseString.java @@ -27,9 +27,6 @@ public CoreseString(String value) { } - public static CoreseString create(String str){ - return new CoreseString(str); - } @Override public IDatatype getDatatype(){ diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseStringBuilder.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseStringBuilder.java index a3f354294..04bb629d8 100644 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseStringBuilder.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseStringBuilder.java @@ -9,9 +9,6 @@ public class CoreseStringBuilder extends CoreseString { value = null; } - public static CoreseStringBuilder create(StringBuilder s){ - return new CoreseStringBuilder(s); - } @Override public String getLabel(){ @@ -26,10 +23,6 @@ public StringBuilder getStringBuilder(){ return sb; } - @Override - public void setStringBuilder(StringBuilder s){ - sb = s; - } } diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseStringLiteral.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseStringLiteral.java old mode 100755 new mode 100644 index fba72f705..51a5cfa85 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseStringLiteral.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseStringLiteral.java @@ -131,12 +131,6 @@ public String getLabel() { } } - /** - * @return the manager - */ - public IStorage getManager() { - return manager; - } /** * @param manager the manager to set diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseStringableImpl.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseStringableImpl.java old mode 100755 new mode 100644 index 3a1a14739..0cc15351b --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseStringableImpl.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseStringableImpl.java @@ -126,30 +126,11 @@ public boolean startsWith(IDatatype iod) { } - //optimization - public boolean contains(String label) { - return getLowerCaseLabel().contains(label.toLowerCase()); - } - - public boolean startsWith(String label) { - return getLabel().startsWith(label); - } @Override public String getNormalizedLabel() { return getLabel(); } - public static String getNormalizedLabel(String label) { - return label; - } - - public boolean equals(String siod) { - return getLabel().equals(siod); - } - - int intCompare(CoreseStringableImpl icod) { - return getLabel().compareTo(icod.getLabel()); - } } diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseURILiteral.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseURILiteral.java index 3fc0e5944..9b1f047c1 100644 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseURILiteral.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseURILiteral.java @@ -26,10 +26,6 @@ public class CoreseURILiteral extends CoreseStringableImpl { public CoreseURILiteral() { } - public CoreseURILiteral(String value) { - super(value); - - } @Override public IDatatype getDatatype() { 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 old mode 100755 new mode 100644 index 6e8af313a..04949a688 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeMap.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeMap.java @@ -230,9 +230,6 @@ public static IDatatype newInstance(float result) { return new CoreseFloat(result); } - public static IDatatype newInstance(IDatatype.Datatype result) { - return getValue(result); - } public static IDatatype create(int result) { return new CoreseInteger(result); @@ -246,12 +243,6 @@ public static IDatatype newInstance(BigDecimal result) { return new CoreseDecimal(result); } - /** - * Use case: LDScript Java compiler - */ - public static IDatatype newLong(long result) { - return new CoreseGenericInteger(result); - } public static IDatatype newInteger(int result) { return getValue(result); @@ -269,9 +260,6 @@ public static IDatatype newFloat(float result) { return newInstance(result); } - public static IDatatype newFloat(double result) { - return new CoreseFloat((float) result); - } public static IDatatype newDecimal(double result) { return new CoreseDecimal(result); @@ -365,9 +353,6 @@ public static IDatatype newResource(String ns, String name) { return newResource(ns + name); } - public static IDatatype uri(String ns, String name) { - return newResource(ns + name); - } public static IDatatype newDate() { return new CoreseDateTime(); @@ -377,23 +362,6 @@ public static IDatatype newDate(String date) { return new CoreseDate(date); } - static String clean(String date) { - String[] str = date.split("T"); - String[] adate = str[0].split("-"); - if (adate.length == 3 && adate[2].length() == 4) { - String mydate = adate[2] + "-" + adate[1] + "-" + adate[0]; - if (str.length == 1) { - return mydate; - } else { - return mydate + "T" + str[1]; - } - } - return date; - } - - public static IDatatype newDate(Date date) { - return newInstance(date); - } public static IDatatype newInstance(XMLGregorianCalendar date) { return new CoreseDate(date); @@ -440,13 +408,6 @@ public static IDatatype newDateTime(String date) { return new CoreseDateTime(date); } - /** - * Create a datatype. If it is a not well formed number, create a - * CoreseUndef - */ - public static IDatatype createLiteral(String label, String datatype) { - return createLiteral(label, datatype, null); - } public static IDatatype createLiteral(String label, String datatype, String lang) { IDatatype dt = null; @@ -468,11 +429,6 @@ public static IDatatype createLiteralWE(String label, String datatype, String la return CoreseDatatype.create(javaType, datatype, label, lang); } - public static IDatatype newXMLLiteral(String label, org.w3c.dom.Node node) { - IDatatype dt = new CoreseXMLLiteral(label); - dt.setObject(node); - return dt; - } public static IDatatype newXMLObject(String label, org.w3c.dom.Node node) { return xml(label, node); @@ -600,9 +556,6 @@ public static IDatatype newServiceReport(String... param) { return json(param); } - public static IDatatype map(String... param) { - return init(map(), param); - } public static CoreseJSON json(JSONObject obj) { return new CoreseJSON(obj); @@ -649,9 +602,6 @@ public static CoreseJSON json() { return new CoreseJSON(new JSONObject()); } - public static CoreseXML xml(org.w3c.dom.Node node) { - return new CoreseXML(node); - } public static CoreseXML xml(String str, org.w3c.dom.Node node) { return new CoreseXML(str, node); @@ -661,14 +611,6 @@ public static IDatatype createList(IDatatype... ldt) { return new CoreseList(ldt); } - public static IDatatype newList(Enumeration en) { - IDatatype list = DatatypeMap.list(); - while (en.hasMoreElements()) { - Object name = en.nextElement(); - list.getList().add(DatatypeMap.castObject(name)); - } - return list; - } public static CoreseList newList(IDatatype... ldt) { return new CoreseList(ldt); @@ -714,13 +656,6 @@ public static IDatatype newStringList(List alist) { return newList(list); } - public static IDatatype newResourceList(List alist) { - ArrayList list = new ArrayList<>(); - for (String str : alist) { - list.add(newResource(str)); - } - return newList(list); - } public static IDatatype newList(List l) { return new CoreseList(l); @@ -752,9 +687,6 @@ public static IDatatype newIterate(int start, int end, int step) { return new CoreseIterate(start, end, step); } - public static IDatatype newInstance(IDatatype... ldt) { - return new CoreseList(ldt); - } public static IDatatype createList() { return createList(new ArrayList<>(0)); @@ -770,11 +702,6 @@ public static IDatatype newInstance(List ldt) { return dt; } - public static IDatatype createList(IDatatype dt) { - ArrayList ldt = new ArrayList(); - ldt.add(dt); - return CoreseList.create(ldt); - } public static IDatatype createList(Collection ldt) { IDatatype dt = CoreseList.create(ldt); @@ -800,13 +727,6 @@ public static void setSPARQLCompliant(boolean b) { LITERAL_AS_STRING = !b; } - public static boolean isLiteralAsString() { - return LITERAL_AS_STRING; - } - - public static void setLiteralAsString(boolean b) { - LITERAL_AS_STRING = b; - } static String datatypeURI(String lang) { if (LITERAL_AS_STRING && (lang == null || lang.equals(""))) { @@ -849,21 +769,6 @@ public static IDatatype createTripleReference(String label) { return dt; } - public static IDatatype createTripleReference(Edge e) { - IDatatype dt = new CoreseTriple(blankID()); - dt.setEdge(e); - return dt; - } - - // dt1 share dt2 - public static void shareTripleReference(IDatatype dt1, IDatatype dt2) { - if (dt2.isTriple()) { - dt1.setTriple(true); - if (dt2.getPointerObject() != null && dt1.getPointerObject() == null) { - dt1.setPointerObject(dt2.getPointerObject()); - } - } - } /** * ***************************** @@ -888,25 +793,16 @@ public static boolean isSimpleLiteral(IDatatype dt) { return isLiteral(dt) && !dt.hasLang(); } - public static boolean isInteger(IDatatype dt) { - return dt.getCode() == IDatatype.Datatype.INTEGER; - } public static boolean isLong(IDatatype dt) { return dt.getCode() == IDatatype.Datatype.INTEGER && dt.getDatatypeURI().equals(fr.inria.corese.core.sparql.datatype.XSD.xsdlong); } - public static boolean isFloat(IDatatype dt) { - return dt.getCode() == IDatatype.Datatype.FLOAT; - } public static boolean isDouble(IDatatype dt) { return dt.getCode() == IDatatype.Datatype.DOUBLE; } - public static boolean isDecimal(IDatatype dt) { - return dt.getCode() == IDatatype.Datatype.DECIMAL; - } public static IDatatype getTZ(IDatatype dt) { if (!dt.isDate()) { @@ -1049,16 +945,6 @@ static boolean stdChar(char c) { || c == '-' || c == '.' || c == '_' || c == '~'; } - public static boolean isBound(IDatatype dt) { - return dt != UNBOUND; - } - - public static IDatatype size(IDatatype dt) { - if (!dt.isList()) { - return null; - } - return dt.length(); - } public static IDatatype first(IDatatype dt) { if (!dt.isList()) { @@ -1158,13 +1044,6 @@ public static IDatatype last(IDatatype list, IDatatype n) { return list.getList().last(n); } - public static IDatatype set(IDatatype list, IDatatype n, IDatatype val) { - if (!list.isList()) { - return null; - } - list.getList().set(n, val); - return val; - } public static IDatatype remove(IDatatype list, IDatatype elem) { if (list.isList()) { @@ -1183,13 +1062,6 @@ public static IDatatype remove(IDatatype list, int n) { return list; } - public static IDatatype listResource(List args) { - ArrayList list = new ArrayList<>(); - for (String uri : args) { - list.add(newResource(uri)); - } - return newList(list); - } public static IDatatype list(IDatatype... args) { ArrayList val = new ArrayList<>(args.length); @@ -1212,12 +1084,6 @@ public static IDatatype sort(IDatatype dt) { return dt.getList().sort(); } - public static IDatatype member(IDatatype elem, IDatatype list) { - if (!list.isList()) { - return null; - } - return list.getList().member(elem); - } public static CoreseXML getXML(IDatatype dt) { if (dt instanceof CoreseXML) { @@ -1301,17 +1167,11 @@ public static IDatatype setPublicDatatypeValue(IDatatype dt) { return dt; } - public static IDatatype getPublicDatatypeValue() { - return TRUE.getPublicDatatypeValue(); - } public static DatatypeMap getDatatypeMap() { return dm; } - public static DatatypeMap getSingleton() { - return dm; - } public static boolean isLiteralDatatype(IDatatype type) { String label = type.getLabel(); @@ -1543,13 +1403,6 @@ public void init2() { } - IDatatype create(String label, String datatype, String lang) { - if (getType(datatype) == IDatatype.Datatype.STRING) { - return new CoreseString(label); - } - - return null; - } @Override public Node nodeList(List list) { diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseIterate.java b/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseIterate.java index beffec3d1..14abeaa67 100644 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseIterate.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseIterate.java @@ -51,9 +51,6 @@ public boolean isExtension() { return true; } - void setStep(int step) { - this.step = step; - } @Override public IDatatype getDatatype() { diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseJSON.java b/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseJSON.java index 25140006f..4edcca8a2 100644 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseJSON.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseJSON.java @@ -199,19 +199,6 @@ public IDatatype path(IDatatype path, int i) { } } - /** - * path = (p1 (p2 p3)* p4) - * exp = (p2 p3)* - */ - void star(IDatatype path, int i) { - IDatatype exp = path.get(i); - // 1) skip exp - path(path, i + 1); - - // 2) - // path' = (p1 exp exp* p4) - - } /** * obj is result of preceding path step diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseList.java b/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseList.java old mode 100755 new mode 100644 index 7647e60c7..406446571 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseList.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseList.java @@ -17,9 +17,6 @@ public class CoreseList extends CoreseExtension implements IDatatypeList { private static int count = 0; private List list; - public CoreseList(String value) { - super(value); - } public CoreseList() { super(SEED + count++); @@ -46,14 +43,6 @@ public static CoreseList create(Collection vec) { return new CoreseList(list); } - // cannot add() - public static CoreseList create(IDatatype[] dts) { - return new CoreseList(dts); - } - - public static CoreseList create() { - return new CoreseList(new ArrayList<>()); - } @Override public IDatatype getDatatype() { @@ -133,9 +122,6 @@ public Object getNodeObject() { return list; } - public void set(IDatatype[] dts) { - list = Arrays.asList(dts); - } @Override public List getValues() { @@ -395,14 +381,6 @@ public IDatatype member(IDatatype elem) { return list.contains(elem) ? TRUE : FALSE; } - // because list has its own compareTo (see above) - @Override - public int mapCompareTo(IDatatype dt) { - if (dt.isList()) { - return getLabel().compareTo(dt.getLabel()); - } - return super.compareTo(dt); - } /** * this is a list of json objects diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseMap.java b/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseMap.java index ee4736b9a..dd30b092a 100644 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseMap.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseMap.java @@ -69,13 +69,6 @@ public Map getMap() { return map; } - public void incr(IDatatype key) { - IDatatype num = get(key); - if (num == null) { - num = DatatypeMap.newInstance(0); - } - set(key, num.intValue() + 1); - } public void set(IDatatype key, int val) { set(key, DatatypeMap.newInstance(val)); @@ -114,9 +107,6 @@ public IDatatype keys() { return DatatypeMap.createList(map.keySet()); } - public IDatatype values() { - return DatatypeMap.createList(map.values()); - } @Override public Iterator iterator() { @@ -138,9 +128,6 @@ public boolean isLoop() { return true; } - public JSONObject toJSON() { - return jsonCast().getNodeObject(); - } public CoreseJSON jsonCast() { CoreseJSON dt = new CoreseJSON(new JSONObject()); @@ -152,9 +139,6 @@ public CoreseJSON jsonCast() { return dt; } - public IDatatype toJSONDatatype() { - return jsonCast(); - } @Override public Iterable getLoop() { 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..c75409557 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 @@ -32,9 +32,6 @@ public class CoresePointer extends CoreseUndefLiteral { Pointerable pobject; - public CoresePointer(Pointerable obj) { - this(obj.getDatatypeLabel(), obj); - } public CoresePointer(String name, Pointerable obj) { @@ -169,12 +166,6 @@ public IDatatype display() { return DatatypeMap.createUndef(getContent(), getDatatypeURI()); } - public String display2() { - StringBuilder sb = new StringBuilder(); - sb.append("\"").append(getContent()).append("\""); - sb.append("^^").append(nsm().toPrefix(getDatatypeURI())); - return sb.toString(); - } @Override public boolean equalsWE(IDatatype dt) throws CoreseDatatypeException { @@ -190,15 +181,6 @@ public boolean equalsWE(IDatatype dt) throws CoreseDatatypeException { return super.equalsWE(dt); } - public boolean equalsWE2(IDatatype dt) throws CoreseDatatypeException { - if (dt.getCode() != IDatatype.Datatype.UNDEF || getDatatype() != dt.getDatatype()) { - return super.equalsWE(dt); - } - if (getPointerObject() == null || dt.getPointerObject() == null) { - return getPointerObject() == dt.getPointerObject(); - } - return getPointerObject().equals(dt.getPointerObject()); - } /** * Pragma: they have same pointer type diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseXML.java b/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseXML.java index f45dff614..63b26b10f 100644 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseXML.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseXML.java @@ -331,12 +331,6 @@ Node genericParentNode(Node node) { return node.getParentNode(); } - IDatatype getTagName(Node node) { - if (node.getNodeType() == Node.ELEMENT_NODE) { - return DatatypeMap.newInstance(getElement(node).getTagName()); - } - return getNodeName(node); - } IDatatype getNodeName(Node node) { return DatatypeMap.newInstance(node.getNodeName()); @@ -480,9 +474,6 @@ String getName(Node node) { return getNameBasic(node); } - String getNameIndex(Node node) { - return node.getNodeName() + "_" + count++; - } String getNameBasic(Node node) { return node.getNodeName(); diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/function/SQLFun.java b/src/main/java/fr/inria/corese/core/sparql/datatype/function/SQLFun.java old mode 100755 new mode 100644 index 6ada0f9d9..0ac9233d8 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/function/SQLFun.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/function/SQLFun.java @@ -54,26 +54,6 @@ private static void ensureDefaultDriverLoaded() { } } - /** - * Executes an SQL query, allowing the specification of a custom JDBC driver. - * The results are returned as a list of lists of strings, - * ensuring that all JDBC resources are properly closed. - * - * @param uri The JDBC connection URI - * @param driverDatatype The IDatatype containing the fully qualified class name of the JDBC driver. - * @param login The database connection username. - * @param passwd The database password. - * @param query The SQL query string to execute. - * @return A list of lists of strings representing the query results. - * Each inner list is a row. Returns an empty list if the query yields no results, - * or null if an unrecoverable error occurs. - */ - public List> sql(IDatatype uri, IDatatype driverDatatype, - IDatatype login, IDatatype passwd, IDatatype query) { - loadJdbcDriver(driverDatatype.getLabel()); - - return sql(uri, login, passwd, query); - } /** * Executes an SQL query, assuming an appropriate JDBC driver has already been loaded diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/function/StringHelper.java b/src/main/java/fr/inria/corese/core/sparql/datatype/function/StringHelper.java index 30d6bbb25..a1ccbb75f 100644 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/function/StringHelper.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/function/StringHelper.java @@ -8,21 +8,7 @@ */ public class StringHelper { - public static final String WORD_DELIMS = "[^a-zA-Z_0-9\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u00FF]"; // = [^a-zA-Z_0-9À-ÖØ-öø-ÿ] : A non-word character but taking accents into account (because \\W doesn't). - - /** - * Compares two Strings, returning true if they are equal ignoring the accents. - * nulls are handled without exceptions. Two null references are considered equal. Comparison is "accent" insensitive. - * @param s1 the first String, may be null, - * @param s2 s2 the second String, may be null - * @return true if the strings are equal, accent insensitive, or both null - */ - public static boolean equalsIgnoreAccent(String s1, String s2) { - if ((s1 != null) && (s2 != null)) { - return removeAccent(s1).equals(removeAccent(s2)); - } else return (s1 == null) && (s2 == null); - } - + public static final String WORD_DELIMS = "[^a-zA-Z_0-9\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u00FF]"; /** * Compares two Strings, returning true if they are equal ignoring case and the accents. * nulls are handled without exceptions. Two null references are considered equal. Comparison is case and "accent" insensitive. @@ -36,26 +22,6 @@ public static boolean equalsIgnoreCaseAndAccent(String s1, String s2) { } else return (s1 == null) && (s2 == null); } - /** - * Compares two Strings, returning true if they are equal ignoring case, the accents and additional 's' or 'x' suffix. - * nulls are handled without exceptions. Two null references are considered equal. Comparison is case and "accent" insensitive. - * @param s1 the first String, may be null, - * @param s2 the second String, may be null - * @return true if the Strings are equal, case and accent insensitive, 's' or 'x' suffix independant, or both null - */ - public static boolean equalsIgnoreCaseAccentAndPlurial(String s1, String s2) { - if ((s1 != null) && (s2 != null)) { - String tmp1 = removeAccent(s1); - String tmp2 = removeAccent(s2); - if (tmp1.endsWith("s") || tmp1.endsWith("x")) { - tmp1 = tmp1.substring(0, tmp1.length()-1); - } - if (tmp2.endsWith("s") || tmp2.endsWith("x")) { - tmp2 = tmp2.substring(0, tmp2.length()-1); - } - return tmp1.equalsIgnoreCase(tmp2); - } else return (s1 == null) && (s2 == null); - } /** * Remove all accents from a given string. @@ -174,26 +140,6 @@ public static boolean containsWord(String text, String word) { return false; } - /** - * Returns true if the given string (considered as a word) is contained in the source one. The algorithm ignores case. - * This method is null safe. - * Example : containsWordIgnoreCase("This is a dog.", "this") => returns true. - * Example : containsWordIgnoreCase("This is a dog.", "his") => returns false. - * @param string1 the text, - * @param string2 the word (or group of words) to look for into the source text. - * @return true if the given word (or group of words) is found in the text, case has been ignored. False otherwise. - */ - public static boolean containsWordIgnoreCase(String string1, String string2) { - if ((string1 == null) || (string2 == null)) { - return false; - } - if (string1.toLowerCase().contains(string2.toLowerCase())) { - String text = string1.toLowerCase(); - String word = string2.toLowerCase(); - return containsWord(text, word); - } - return false; - } /** * Returns true if the given string (considered as a word) is contained in the source one. The algorithm ignores case and accents. @@ -216,34 +162,6 @@ public static boolean containsWordIgnoreCaseAndAccent(String string1, String str return false; } - /** - * Returns true if the given string (considered as a word) is contained in the source one. The algorithm ignores case, accents and additional 's' or 'x' suffix. - * This method is null safe. - * Example : containsWordIgnoreCaseAccentAndPlurial("ceci est ma clé.", "cles") => returns true. - * Example : containsWordIgnoreCaseAccentAndPlurial("Ceci est ma cle.", "eci") => returns false. - * @param string1 the text, - * @param string2 the word (or group of words) to look for into the source text. - * @return true if the given word (or group of words) is found in the text, case, accents and 's' or 'x' suffix have been ignored. False otherwise. - */ - public static boolean containsWordIgnoreCaseAccentAndPlurial(String string1, String string2) { - if ((string1 == null) || (string2 == null)) { - return false; - } - String text = removeAccent(string1).toLowerCase(); - String word = removeAccent(string2).toLowerCase(); - if (text.contains(word) && containsWord(text, word)) { - return true; - } - if (word.endsWith("s") || word.endsWith("x")) { - word = word.substring(0, word.length()-1); - return text.contains(word) && containsWord(text, word); - } else { - if (text.contains(word+"s") && containsWord(text, word+"s")) { - return true; - } - return text.contains(word + "x") && containsWord(text, word + "x"); - } - } /** * Returns the index within the text of the first occurrence of the specified word (or groups of words). @@ -282,24 +200,6 @@ public static int indexOfWord(String text, String word) { return -1; } - /** - * Returns the index within the text of the first occurrence of the specified word (or groups of words). The algorithm ignores case. - * This method is null safe. - * @param string1 the text, - * @param string2 the word (or group of words), - * @return the index within the text of the first occurrence of the specified word. - */ - public static int indexOfWordIgnoreCase(String string1, String string2) { - if ((string1 == null) || (string2 == null)) { - return -1; - } - if (string1.toLowerCase().contains(string2.toLowerCase())) { - String text = string1.toLowerCase(); - String word = string2.toLowerCase(); - return indexOfWord(text, word); - } - return -1; - } /** * Returns the index within the text of the first occurrence of the specified word (or groups of words). The algorithm ignores case and accents. @@ -320,143 +220,4 @@ public static int indexOfWordIgnoreCaseAndAccent(String string1, String string2) return -1; } - /** - * Returns the index within the text of the first occurrence of the specified word (or groups of words). The algorithm ignores case, accents and 's' or 'x' suffix. - * This method is null safe. - * @param string1 the text, - * @param string2 the word (or group of words), - * @return the index within the text of the first occurrence of the specified word. - */ - public static int indexOfWordIgnoreCaseAccentAndPlurial(String string1, String string2) { - if ((string1 == null) || (string2 == null)) { - return -1; - } - String text = removeAccent(string1).toLowerCase(); - String word = removeAccent(string2).toLowerCase(); - if (containsWordIgnoreCaseAndAccent(text, word)) { - return indexOfWordIgnoreCaseAndAccent(text, word); - } - if (word.endsWith("s") || word.endsWith("x")) { - word = word.substring(0, word.length()-1); - if (containsWordIgnoreCaseAndAccent(text, word)) { - return indexOfWordIgnoreCaseAndAccent(text, word); - } - } else { - if (containsWordIgnoreCaseAndAccent(text, word+"s")) { - return indexOfWordIgnoreCaseAndAccent(text, word+"s"); - } - if (containsWordIgnoreCaseAndAccent(text, word+"x")) { - return indexOfWordIgnoreCaseAndAccent(text, word+"x"); - } - } - return -1; - } - - /** - * Checks whether the string passed as parameter is a valid Java number. - * Valid numbers include hexadecimal marked with the 0x - * qualifier, scientific notation and numbers marked with a type - * qualifier (e.g. 123L). - * - * @param str the string to check - * @return true if the string denotes a correctly formatted number, false otherwise. - */ - public static boolean isNumber(String str) { - if ((str == null) || (str.trim().length() == 0)) { - return false; - } - - char[] chars = str.toCharArray(); - int sz = chars.length; - boolean hasExp = false; - boolean hasDecPoint = false; - boolean allowSigns = false; - boolean foundDigit = false; - - // deal with any possible sign up front - int start = (chars[0] == '-') ? 1 : 0; - if (sz > start + 1) { - if (chars[start] == '0' && chars[start + 1] == 'x') { - int i = start + 2; - if (i == sz) { - return false; // str == "0x" - } - // checking hex (it can't be anything else) - for (; i < chars.length; i++) { - if ((chars[i] < '0' || chars[i] > '9') - && (chars[i] < 'a' || chars[i] > 'f') - && (chars[i] < 'A' || chars[i] > 'F')) { - return false; - } - } - return true; - } - } - - sz--; // don't want to loop to the last char, check it afterwords - // for type qualifiers - int i = start; - // loop to the next to last char or to the last char if we need another digit to - // make a valid number (e.g. chars[0..5] = "1234E") - while (i < sz || (i < sz + 1 && allowSigns && !foundDigit)) { - if (chars[i] >= '0' && chars[i] <= '9') { - foundDigit = true; - allowSigns = false; - - } else if (chars[i] == '.') { - if (hasDecPoint || hasExp) { - // two decimal points or dec in exponent - return false; - } - hasDecPoint = true; - } else if (chars[i] == 'e' || chars[i] == 'E') { - // we've already taken care of hex. - if (hasExp) { - // two E's - return false; - } - if (!foundDigit) { - return false; - } - hasExp = true; - allowSigns = true; - } else if (chars[i] == '+' || chars[i] == '-') { - if (!allowSigns) { - return false; - } - allowSigns = false; - foundDigit = false; // we need a digit after the E - } else { - return false; - } - i++; - } - if (i < chars.length) { - if (chars[i] >= '0' && chars[i] <= '9') { - // no type qualifier, OK - return true; - } - if (chars[i] == 'e' || chars[i] == 'E') { - // can't have an E at the last byte - return false; - } - if (!allowSigns - && (chars[i] == 'd' - || chars[i] == 'D' - || chars[i] == 'f' - || chars[i] == 'F')) { - return foundDigit; - } - if (chars[i] == 'l' - || chars[i] == 'L') { - // not allowing L with an exponent - return foundDigit && !hasExp; - } - // last character is illegal - return false; - } - // allowSigns is true iff the val ends in 'E' - // found digit it to make sure weird stuff like '.' and '1E-' doesn't pass - return !allowSigns && foundDigit; - } } diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/function/XPathFun.java b/src/main/java/fr/inria/corese/core/sparql/datatype/function/XPathFun.java old mode 100755 new mode 100644 index 534d87de1..5d8893b29 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/function/XPathFun.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/function/XPathFun.java @@ -54,9 +54,6 @@ public XPathFun() { } - public XPathFun(boolean bindex) { - setNameIndex(bindex); - } // bindex = true : label of Node is tag name + index // bindex = false : label of Node is tag name only @@ -64,10 +61,6 @@ public void setNameIndex(boolean b) { bindex = b; } - public void init(NSManager nsm, VariableResolver res, boolean constant) { - init(nsm, constant); - set(res); - } public void init(NSManager nsm, boolean constant) { isXPathConstant = constant; diff --git a/src/main/java/fr/inria/corese/core/sparql/exceptions/CompileException.java b/src/main/java/fr/inria/corese/core/sparql/exceptions/CompileException.java index bf1d2b8b6..34d378f3c 100644 --- a/src/main/java/fr/inria/corese/core/sparql/exceptions/CompileException.java +++ b/src/main/java/fr/inria/corese/core/sparql/exceptions/CompileException.java @@ -9,7 +9,4 @@ public class CompileException extends QuerySemanticException { public CompileException() {} - public CompileException(String mes) { - super(mes); - } } diff --git a/src/main/java/fr/inria/corese/core/sparql/exceptions/CoreseException.java b/src/main/java/fr/inria/corese/core/sparql/exceptions/CoreseException.java index cbd2a1325..008f57c07 100644 --- a/src/main/java/fr/inria/corese/core/sparql/exceptions/CoreseException.java +++ b/src/main/java/fr/inria/corese/core/sparql/exceptions/CoreseException.java @@ -24,29 +24,10 @@ public class CoreseException extends Exception { public CoreseException() { } - public CoreseException(String msg, String obj) { - super(msg); - object = obj; - } public CoreseException(String msg) { super(msg); } - public CoreseException(Throwable cause) { - super(cause); - } - - public CoreseException(String msg, Throwable cause) { - super(msg, cause); - } - - public Object getObject() { - return object; - } - - public void setObject(Object obj) { //modif Olivier Savoie pour le repackaging - object = obj; - } } 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..e7e9acbe4 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 @@ -31,10 +31,6 @@ public EngineException(Exception e) { super(e); } - public EngineException(Exception e, URLServer url) { - super(e); - setURL(url); - } public EngineException(Exception e, String m) { super(e, m); @@ -60,12 +56,6 @@ public static EngineException cast(SparqlException e) { return new EngineException(e); } - public Exception getException() { - if (getCause() instanceof Exception) { - return (Exception) getCause(); - } - return null; - } public boolean isSafetyException() { return false; diff --git a/src/main/java/fr/inria/corese/core/sparql/exceptions/LDScriptException.java b/src/main/java/fr/inria/corese/core/sparql/exceptions/LDScriptException.java index db140ac4e..7bb3ad481 100644 --- a/src/main/java/fr/inria/corese/core/sparql/exceptions/LDScriptException.java +++ b/src/main/java/fr/inria/corese/core/sparql/exceptions/LDScriptException.java @@ -14,10 +14,6 @@ public LDScriptException(IDatatype dt) { this.dt = dt; } - public LDScriptException(IDatatype dt, boolean b) { - this.dt = dt; - setStop(b); - } @Override public IDatatype getDatatypeValue() { diff --git a/src/main/java/fr/inria/corese/core/sparql/exceptions/SQLFunException.java b/src/main/java/fr/inria/corese/core/sparql/exceptions/SQLFunException.java index e2b4ba1f9..142c12910 100644 --- a/src/main/java/fr/inria/corese/core/sparql/exceptions/SQLFunException.java +++ b/src/main/java/fr/inria/corese/core/sparql/exceptions/SQLFunException.java @@ -7,14 +7,6 @@ * more explicit and easier to manage by callers. */ public class SQLFunException extends RuntimeException { - /** - * Constructs a new SQLFunException with the specified detail message. - * - * @param message the detail message (which is saved for later retrieval by the {@link #getMessage()} method). - */ - public SQLFunException(String message) { - super(message); - } /** * Constructs a new SQLFunException with the specified detail message and cause. diff --git a/src/main/java/fr/inria/corese/core/sparql/exceptions/SafetyException.java b/src/main/java/fr/inria/corese/core/sparql/exceptions/SafetyException.java index b563dde98..2f43b5097 100644 --- a/src/main/java/fr/inria/corese/core/sparql/exceptions/SafetyException.java +++ b/src/main/java/fr/inria/corese/core/sparql/exceptions/SafetyException.java @@ -9,9 +9,6 @@ public class SafetyException extends EngineException { public SafetyException() { } - public SafetyException(EngineException e) { - super(e); - } public SafetyException(String mes) { super(mes); diff --git a/src/main/java/fr/inria/corese/core/sparql/storage/fs/FileHandler.java b/src/main/java/fr/inria/corese/core/sparql/storage/fs/FileHandler.java index 204c043fc..034e9341b 100644 --- a/src/main/java/fr/inria/corese/core/sparql/storage/fs/FileHandler.java +++ b/src/main/java/fr/inria/corese/core/sparql/storage/fs/FileHandler.java @@ -116,14 +116,6 @@ public void allocalteBuffer(int buf) { } } - /** - * Get the offset of the buffer regarding to the mapped file - * - * @return - */ - public long getBufferOffset() { - return bufferOffset; - } /** * Return the remaining space that be used for storing data diff --git a/src/main/java/fr/inria/corese/core/sparql/storage/fs/StringMeta.java b/src/main/java/fr/inria/corese/core/sparql/storage/fs/StringMeta.java index a56006b21..4aff47033 100644 --- a/src/main/java/fr/inria/corese/core/sparql/storage/fs/StringMeta.java +++ b/src/main/java/fr/inria/corese/core/sparql/storage/fs/StringMeta.java @@ -22,37 +22,21 @@ public StringMeta(int id, int fid, int offset, int length) { this.length = length; } - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } public int getFid() { return fid; } - public void setFid(int fid) { - this.fid = fid; - } public long getOffset() { return offset; } - public void setOffset(int offset) { - this.offset = offset; - } public int getLength() { return length; } - public void setLength(int length) { - this.length = length; - } @Override public String toString() { diff --git a/src/main/java/fr/inria/corese/core/sparql/storage/util/StorageFactory.java b/src/main/java/fr/inria/corese/core/sparql/storage/util/StorageFactory.java index 0cb38d82d..66c78ede2 100644 --- a/src/main/java/fr/inria/corese/core/sparql/storage/util/StorageFactory.java +++ b/src/main/java/fr/inria/corese/core/sparql/storage/util/StorageFactory.java @@ -28,13 +28,4 @@ public static IStorage create(int type, Parameters params) { } } - /** - * Create persistent manager using default parameters - * - * @param type - * @return - */ - public static IStorage create(int type) { - return create(type, null); - } } 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..96dbf08fe 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 @@ -51,15 +51,6 @@ public IDatatype eval(Computer eval, Binding b, Environment env, Producer p) thr } - /** - * Generic get with variable name and index - * may be unbound, return specific UNDEF value because null would be considered an error - * embedding let will let the variable unbound, see getConstantValue() - * it can be catched with bound(var) or coalesce(var) - */ - public static IDatatype gget(IDatatype dt, IDatatype var){ - return gget(dt, var, DatatypeMap.ZERO); - } static IDatatype last(IDatatype dt, IDatatype ind) { if (! dt.isList()) { 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..5d1143445 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 @@ -19,9 +19,6 @@ public class ZeroAry extends TermEval { public ZeroAry() {} - public ZeroAry(String name) { - super(name); - } @Override public IDatatype eval(Computer eval, Binding b, Environment env, Producer p) throws EngineException { 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..eabed29a4 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 @@ -164,53 +164,6 @@ void visit(Environment env) { } } - /** - * Eval with param already computed Use case: xt:main(), xt:produce(?q) - * - * @param eval - * @param b - * @param env - * @param p - * @param param - * @return - */ - @Override - public IDatatype eval(Computer eval, Binding b, Environment env, Producer p, IDatatype[] param) throws EngineException { - if (function == null) { - function = getDefine(this, env); - if (function == null) { - logger.error("Undefined function: " + this); - return null; - } - } - - Expression fun = function.getSignature(); - IDatatype dt; - 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); - // PRAGMA: b = cc.getEnvironment().getBind() - dt = function.getBody().eval(cc.getEvaluator(), b, cc.getEnvironment(), p); - } else { - dt = function.getBody().eval(eval, b, env, p); - } - b.unset(function, fun.getExpList()); - - if (dt == null) { - return null; - } - //return DatatypeMap.getResultValue(dt); - return b.resultValue(dt); - - } - - /** - * @return the tailRecursion - */ - public boolean isTailRecursion() { - return tailRecursion; - } /** * @param tailRecursion the tailRecursion to set 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..b4c888ab9 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 @@ -58,9 +58,6 @@ public class Function extends Statement { public Function() { } - public Function(Term fun, Expression body) { - this(fun, null, body, false); - } public Function(Term fun, Constant type, Expression body, boolean lambda) { super(Processor.FUNCTION, fun, body); @@ -80,9 +77,6 @@ public Term getFunction() { return getSignature(); } - public Constant getReturnType() { - return type; - } public IDatatype getReturnDatatype() { return (type == null) ? null : type.getDatatypeValue(); @@ -127,13 +121,6 @@ public Constant getType(Variable var) { return getTable().get(var.getLabel()); } - public IDatatype getDatatype(Variable var) { - Constant cst = getType(var); - if (cst != null) { - return cst.getDatatypeValue(); - } - return null; - } @Override public Expression compile(ASTQuery ast) throws EngineException { @@ -264,13 +251,6 @@ void annotate(Metadata m, String a) { } } - /** - * @return the isTest - */ - @Override - public boolean isTester() { - return isTest; - } /** * @param isTest the isTest to set @@ -381,9 +361,6 @@ public void tailRecursion() { getBody().tailRecursion(this); } - private Expression lastStatement() { - return this; - } /** * Replace arg by var in the body 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..9bb5e397f 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 @@ -25,11 +25,5 @@ public class JavaFunction extends LDScript { // } } - /** - * @param reject the reject to set - */ - public void setReject(boolean reject) { - this.reject = reject; - } } 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 fe07d2c47..639bde3b1 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 @@ -31,10 +31,6 @@ public LDScript(String name) { super(name, e1, e2); } - @Override - public boolean isLDScript() { - return true; - } @Override public Expression prepare(ASTQuery ast) throws EngineException { @@ -44,9 +40,6 @@ public Expression prepare(ASTQuery ast) throws EngineException { } - public boolean isDefined(Expr exp) { - return getExtension().isDefined(exp); - } public Function getDefine(Expr exp, Environment env) { ASTExtension ext = env.getExtension(); @@ -60,9 +53,6 @@ public Function getDefine(Expr exp, Environment env) { return getExtension().get(exp); } - public Function getDefine(String name) { - return getExtension().get(name); - } public Function getDefineGenerate(Expr exp, Environment env, String name, int n) throws EngineException { @@ -138,9 +128,6 @@ public Function getDefineMethod(Environment env, String name, IDatatype type, ID return getExtension().getMethod(name, type, param); } - public void define(Function exp) { - getExtension().define(exp); - } public ASTExtension getExtension() { return ASTExtension.getSingleton(); 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..826e66975 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 @@ -27,11 +27,6 @@ public class Let extends Statement { public Let() {} - public Let(Expression def, Expression body) { - super(Processor.LET, def, body); - setDeclaration(def); - setBody(body); - } public Let(Expression def, Expression body, boolean dyn) { super(Processor.LET, def, body); 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..a05ee4ab4 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 @@ -114,111 +114,5 @@ public IDatatype eval(Computer eval, Binding b, Environment env, Producer p) thr } - public IDatatype evalold(Computer eval, Binding b, Environment env, Producer p) throws EngineException { - IDatatype name = getBasicArg(0).eval(eval, b, env, p); - IDatatype[] param = evalArguments(eval, b, env, p, 1); - if (name == null || param == null) { - return null; - } - - Function function = null; - try { - function = getDefineGenerate(this, env, name.stringValue(), param.length); - } catch (EngineException ex) { - log(ex.getMessage()); - } - if (function == null) { - return null; - } - - /** - * every (xt:fun, ?list) every (xt:fun, ?x, ?list) every (xt:fun, ?l1, - * ?l2) TODO: when getLoop() it works with only one loop error follow - * SPARQ semantics of OR (any) AND (every) - * - * @return - */ - boolean every = oper() == MAPEVERY; - boolean any = oper() == MAPANY; - IDatatype list = null; - IDatatype ldt = null; - Iterator loop = null; - boolean isList = false, isLoop = false; - - - int k = 0; - for (IDatatype dt : param) { - if (dt.isList() && !isList && !isLoop) { - isList = true; - list = dt; - } else if (dt.isLoop()) { - if (!isList && !isLoop) { - isLoop = true; - ldt = dt; - loop = ldt.iterator(); - } else { - // list + loop || loop + loop - // snd_loop.toList() - param[k] = dt.toList(); - } - } - - k++; - } - if (list == null && ldt == null) { - return null; - } - IDatatype[] value = new IDatatype[param.length]; - boolean error = false, ok = true; - - for (int i = 0; (isList) ? i < list.size() : loop.hasNext(); i++) { - - for (int j = 0; j < value.length; j++) { - IDatatype dt = param[j]; - if (dt.isList()) { - value[j] = (i < dt.size()) ? dt.get(i) : dt.get(dt.size() - 1); - } else if (isLoop && dt.isLoop()) { - if (loop.hasNext()) { - // TODO: track the case with several dt loop - value[j] = loop.next(); - if (value[j] == null){ - // some iterators (DataProducer) return null when there is no more element - ok = false; - } - } else { - return null; - } - } else { - value[j] = dt; - } - } - - if (ok) { - IDatatype res = call(eval, b, env, p, function, value); - - if (res == null) { - error = true; - } else { - if (every) { - if (!res.booleanValue()) { - return FALSE; - } - } else if (any) { - // any - if (res.booleanValue()) { - return TRUE; - } - } - } - } - } - - if (error) { - return null; - } - return value(every); - - - } } 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..abc283c81 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 @@ -226,29 +226,6 @@ else if (mapfindelem){ // } // } // else { -// add(mlist, dt, mapmerge); -// } -// } -// return DatatypeMap.createList(mlist); -// } -// else if (maplist){ -// return DatatypeMap.createList(res); -// } -// else if (mapfindlist){ -// return DatatypeMap.createList(sub); -// } -// else if (mapfindelem){ -// return null; -// } -// return TRUE; -// } - - // if list size is <= i, focus on last element of the list - // use case: maplist(?fun, ?list, xt:list(?lst)) - // The second ?lst argument is itself a list and we do not want to iterate this one - IDatatype getValue(IDatatype dt, int i) { - return (i < dt.size()) ? dt.get(i) : dt.get(dt.size() - 1); - } void add(List list, IDatatype dt, boolean merge){ if (merge){ diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Statement.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Statement.java old mode 100755 new mode 100644 index f1400b9b3..123408f0b --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Statement.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Statement.java @@ -26,10 +26,6 @@ public Statement(){} setFunction(true); } - @Override - public boolean isStatement(){ - return true; - } /** * @return the nbVariable 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..b47ef05af 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 @@ -30,9 +30,6 @@ public TemplateFunction(String name){ super(name); } - public boolean isTemplate() { - return true; - } /** * st:format (e1, st:number(), e2) @@ -113,12 +110,6 @@ IDatatype[] getParam(IDatatype[] obj, int n){ return Arrays.copyOfRange(obj, n, obj.length); } - String getLabel(IDatatype dt) { - if (dt == null) { - return null; - } - return dt.getLabel(); - } boolean isAll() { return oper() == ExprType.APPLY_TEMPLATES_ALL 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 eaeeebcdc..b525e84f7 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 @@ -184,9 +184,6 @@ public boolean hasBind() { return varList.size() > 0 || level.size() > 0; } - public boolean isEmpty() { - return size() == 0 && getGlobalVariableNames().isEmpty(); - } int getIndex(Expr var) { return currentLevel + var.getIndex(); @@ -413,9 +410,6 @@ public IDatatype getBasic(Expr var, boolean withStatic) { } } - String pretty(int n) { - return "(" + ((n < 10) ? ("0" + n) : n) + ")"; - } // todo: why not level ??? @Override @@ -432,13 +426,6 @@ int getLevel() { return level.get(level.size() - 1); } - public int getCurrentLevel() { - return (level.isEmpty()) ? 0 : getLevel(); - } - - public int getCurrentVariableLevel() { - return varList.isEmpty() ? 0 : varList.size() - 1; - } // global variable public IDatatype getVariable(String name) { @@ -459,15 +446,6 @@ public IDatatype getBasicGlobalVariable(String name) { return getGlobalVariableValues().get(name); } - public IDatatype popBasicGlobalVariable(String name) { - IDatatype dt = getGlobalVariableValues().get(name); - setGlobalVariable(name, null); - return dt; - } - - public IDatatype getGlobalVariableBasic(String name) { - return getGlobalVariableValues().get(name); - } public Binding setVariable(String name, IDatatype val) { return bind(new VariableLocal(name), val); @@ -492,9 +470,6 @@ public static IDatatype getStaticVariable(String name) { return getSingleton().getVariable(name); } - public boolean hasVariable() { - return ! getGlobalVariableValues().isEmpty(); - } // must be LocalVariable, i.e. LDScript Variable public Binding bind(Variable var, IDatatype val) { @@ -669,9 +644,6 @@ void setGlobalVariableValues(HashMap m) { globalValue = m; } - public int getCount() { - return count; - } /** * return(dt) LDScript function set boolean result field to true @@ -798,17 +770,6 @@ public void setAccessRight(AccessRight accessRight) { } - public static int getDefaultValue(String name, int value) { - IDatatype dt = getStaticVariable(name); - return (dt == null) ? value: dt.intValue(); - } - - public Context getCreateContext() { - if (getContext() == null) { - setContext(new Context()); - } - return getContext(); - } public Context getContext() { return context; @@ -818,9 +779,6 @@ public void setContext(Context context) { this.context = context; } - public void set(Context c) { - share(c); - } public void share(Context c) { setContext(c); @@ -932,13 +890,6 @@ public void setReport(IDatatype report) { this.report = report; } - public Object getTransformerVisitor() { - return getShare().getTransformerVisitor(); - } - - public void setTransformerVisitor(Object transformerVisitor) { - getShare().setTransformerVisitor(transformerVisitor); - } public Share getShare() { return share; @@ -948,10 +899,5 @@ public void setShare(Share share) { this.share = share; } - // service parameter - public void init(HashMapList map) { - IDatatype dt = DatatypeMap.cast(map); - setGlobalVariable(SERVICE_PARAM, dt); - } } 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..e8e25b351 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 @@ -18,9 +18,6 @@ public class DivTerm extends BinaryFunction { public DivTerm(){ } - public DivTerm(String name){ - super(name); - } public DivTerm(String name, Expression e1, Expression e2){ super(name, e1, e2); 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..0d6eb3613 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 @@ -18,9 +18,6 @@ public class EQ extends BinaryFunction { public EQ(){ } - public EQ(String name){ - super(name); - } public EQ(String name, Expression e1, Expression e2){ super(name, e1, e2); 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..85adfb46c 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 @@ -18,9 +18,6 @@ public class GE extends BinaryFunction { public GE(){ } - public GE(String name){ - super(name); - } public GE(String name, Expression e1, Expression e2){ super(name, e1, e2); 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..2467cfb71 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 @@ -18,9 +18,6 @@ public class GT extends BinaryFunction { public GT(){ } - public GT(String name){ - super(name); - } public GT(String name, Expression e1, Expression e2){ super(name, e1, e2); 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..650567d2f 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 @@ -18,9 +18,6 @@ public class LE extends BinaryFunction { public LE(){ } - public LE(String name){ - super(name); - } public LE(String name, Expression e1, Expression e2){ super(name, e1, e2); 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..3b83dcc01 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 @@ -18,9 +18,6 @@ public class LT extends BinaryFunction { public LT(){ } - public LT(String name){ - super(name); - } public LT(String name, Expression e1, Expression e2){ super(name, e1, e2); 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..dce2b363b 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 @@ -17,9 +17,6 @@ public class MinusTerm extends BinaryFunction { public MinusTerm(){} - public MinusTerm(String name){ - super(name); - } public MinusTerm(String name, Expression e1, Expression e2) { super(name, e1, e2); 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..4fcbb15c7 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 @@ -18,9 +18,6 @@ public class MultTerm extends BinaryFunction { public MultTerm(){ } - public MultTerm(String name){ - super(name); - } public MultTerm(String name, Expression e1, Expression e2){ super(name, e1, e2); 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..984121165 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 @@ -18,9 +18,6 @@ public class NEQ extends BinaryFunction { public NEQ(){ } - public NEQ(String name){ - super(name); - } public NEQ(String name, Expression e1, Expression e2){ super(name, e1, e2); 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..562a9d5a1 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 @@ -17,10 +17,6 @@ public class NotTerm extends TermEval { public NotTerm() { } - public NotTerm(String name) { - super(name); - setArity(1); - } public NotTerm(String name, Expression e1) { super(name, e1); 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..ec24a2d94 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 @@ -18,9 +18,6 @@ public class PlusTerm extends BinaryFunction { public PlusTerm(){ } - public PlusTerm(String name){ - super(name); - } public PlusTerm(String name, Expression e1, Expression e2){ super(name, e1, e2); 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..4dcd6c471 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 @@ -45,10 +45,6 @@ public class TermEval extends Term { public static final String SERVICE_MESS = "Service unauthorized"; - public TermEval(String name, Expression e1, Expression e2, Expression e3) { - super(name, e1, e2); - add(e3); - } public TermEval(String name, Expression e1, Expression e2) { super(name, e1, e2); @@ -167,13 +163,6 @@ public boolean accept(Feature feature, Binding b) { return Access.accept(feature, b.getAccessLevel()); } - public boolean reject(Feature feature, Binding b) { - return Access.reject(feature, b.getAccessLevel()); - } - - public boolean reject(Feature feature, Binding b, String uri) { - return Access.reject(feature, b.getAccessLevel(), uri); - } public void check(Feature feature, Binding b, String uri, String mes) throws SafetyException { Access.check(feature, b.getAccessLevel(), uri, mes); diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/javacc1/JavaccParseException.java b/src/main/java/fr/inria/corese/core/sparql/triple/javacc1/JavaccParseException.java index 536fb45a7..71d503f19 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/javacc1/JavaccParseException.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/javacc1/JavaccParseException.java @@ -40,13 +40,6 @@ public String getMessage() { return message; } - public Vector getExpectedToken() { - return expectedToken; - } - - public String getEncouteredToken() { - return encouteredToken; - } private void setExpectedToken() { String expected = ""; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTBuffer.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTBuffer.java index 668a4f058..5f9b73657 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTBuffer.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTBuffer.java @@ -105,9 +105,6 @@ public HashMap getDone() { return done; } - public void setDone(HashMap done) { - this.done = done; - } /** * Do not print (nested) rdf star triple twice 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..c62907e6a 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 @@ -47,9 +47,6 @@ Function getMetadata(String name) { return metadata.get(name); } - HashMap getMetadata() { - return metadata; - } // @before -> f1 ; @after -> f2 void setMetadata(Function exp) { @@ -107,10 +104,6 @@ public ASTExtension() { } } - public ASTExtension(String n){ - this(); - name = n; - } FunMap getMap(Expr exp){ return getMap(exp.arity()); @@ -228,32 +221,12 @@ public void add(ASTExtension ext){ } } - /** - * Use case: Transformation st:profile exports its functions to transformation - * They are declared as public - * Hence Interpreter isPublic() is OK. - */ - public void setPublic(boolean b){ - for (FunMap m : getMaps()){ - for (Function e : m.values()){ - e.setPublic(b); - } - } - } @Override public boolean isDefined(Expr exp) { return getMap(exp).containsKey(exp.getLabel()); } - /** - * exp: st:fac(?n) values: #[10] actual values of parameters return body of - * fun - * @param exp - */ - public Function get(Expr exp, Object[] values) { - return getMap(exp).get(exp.getLabel()); - } @Override public Function get(Expr exp) { @@ -337,33 +310,6 @@ public String toString() { return sb.toString(); } - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } - - /** - * @return the pack - */ - public Object getPackage() { - return pack; - } - - /** - * @param pack the pack to set - */ - public void setPackage(Object pack) { - this.pack = pack; - } /** * @return the extension @@ -404,12 +350,6 @@ public void setHierarchy(Hierarchy hierarchy) { this.hierarchy = hierarchy; } - /** - * @return the debug - */ - public boolean isDebug() { - return debug; - } /** * @param debug the debug to set diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTFactory.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTFactory.java index 02281013e..aaf2e355e 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTFactory.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTFactory.java @@ -26,11 +26,6 @@ List defineExpand(ExpressionList expList, Expression exp) { return expandMatch(matchTerm); } - List defLetList(Variable var, Constant type, Expression exp) { - ArrayList list = new ArrayList<>(); - list.add(defLet(var, type, exp)); - return list; - } Term defLet(Variable var, Constant type, Expression exp) { return Term.create("=", var, exp); @@ -50,9 +45,6 @@ Let let(Expression exp, Expression body) { return let(list, body, false); } - Let let(List el, Expression body) { - return let(el, body, false); - } // new version where let has several declarations Let defineLet2(List el, Expression body, int n, boolean dynamic) { @@ -284,11 +276,6 @@ Term defGenericGetLast(Variable var, Expression exp, int i) { return defLet(var, fun); } - Term defRest(Variable var, Expression exp, int i) { - Term fun = createFunction(createQName(Processor.FUN_XT_GREST), exp); - fun.add(Constant.create(i)); - return defLet(var, fun); - } /** * Generate a subList starting at ith element of target list diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTPrinter.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTPrinter.java index f4e132139..3b51388f5 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTPrinter.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTPrinter.java @@ -360,9 +360,6 @@ public boolean isLambda() { } - public void setLambda(boolean lambda) { - this.lambda = lambda; - } public ASTBuffer getBuffer() { @@ -378,10 +375,6 @@ public boolean isService() { return service; } - public ASTPrinter setService(boolean service) { - this.service = service; - return this; - } } diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTSelector.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTSelector.java index 707a5cb11..9067aad43 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTSelector.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTSelector.java @@ -176,17 +176,11 @@ public HashMap> getTripleService() { return tripleService; } - public void setTripleService(HashMap> tripleService) { - this.tripleService = tripleService; - } public HashMap> getBgpService() { return bgpService; } - public void setBgpService(HashMap> bgpService) { - this.bgpService = bgpService; - } public HashMap getBgpFail() { return bgpFail; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTTemplate.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTTemplate.java index 58ce74b8d..06524056a 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTTemplate.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTTemplate.java @@ -119,14 +119,6 @@ public Term createXML(Constant cst, ArrayList lattr, ExpressionL return ast.createFunction(ast.createQName(FUN_TEMPLATE_CONCAT), arg); } - /** - * vbox() if (type.equals(VBOX) && el.size() > 1){ // add NL between - * elements Term t = createFunction(nl); for (int i=1; i<el.size(); ){ - * el.add(i, t); i += 2; } } @param s - */ - public void setGroupSeparator(String s) { - groupSeparator = s; - } public void addTemplate(Expression at) { template.add(at); @@ -282,10 +274,6 @@ Term compile(Variable var, boolean coalesce) { return t; } - Term compile(Constant cst) { - Term t = ast.createFunction(ast.createQName(FUN_PROCESS_URI), cst); - return t; - } /** * @@ -301,17 +289,6 @@ public Term createTemplateGroup() { return t; } - /** - * Aggregate that build the result of a template when there are several - * results default is group_concat draft: agg_and - */ - static void setTemplateAggregate(String s) { - FUN_TEMPLATE_AGG = s; - } - - static void setTemplateConcat(String s) { - FUN_TEMPLATE_CONCAT = s; - } Constant getEmpty() { if (empty == null) { @@ -320,9 +297,6 @@ Constant getEmpty() { return empty; } - Variable templateVariable(Variable var) { - return Variable.create(KGRAMVAR + countVar++); - } String getSeparator() { return templateSeparator; 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..865c1cc6c 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 @@ -73,12 +73,6 @@ int getValue() { return value; } - public Level min(Level r2) { - if (this.getValue() <= r2.getValue()) { - return this; - } - return r2; - } // does this action level provide access to feature level boolean provide(Level featureLevel) { @@ -191,9 +185,6 @@ public static boolean isActive() { return ! SKIP; } - public Access singleton() { - return singleton; - } private static FeatureLevel driver() { @@ -216,19 +207,11 @@ public static void set(Feature feature, Level accessRight) { driver().put(feature, accessRight); } - public static Level setValue(Feature feature, Level accessRight) { - Level level = get(feature); - driver().put(feature, accessRight); - return level; - } public static Level get(Feature feature) { return driver().get(feature); } - public static boolean provide(Feature feature) { - return accept(feature, USER_DEFAULT); - } // tune level value if the server is protected or not // if the server is not protected, public -> default @@ -304,16 +287,6 @@ public static boolean acceptNamespace(Feature feature, Level actionLevel, String } } - // used by server - public static List selectNamespace(Feature feature, Level level, List list) { - ArrayList alist = new ArrayList<>(); - for (String uri : list) { - if (acceptNamespace(feature, level, uri)) { - alist.add(uri); - } - } - return alist; - } // by default, isDefaultResultWhenEmptyAccept() is false // DataManagerJava initGraph() set it true in order to authorize xt:read() @@ -327,35 +300,6 @@ public static void define(String ns, boolean b) { AccessNamespace.define(ns, b); } - public static void define(Feature feature, Level accessRight) { - set(feature, accessRight); - } - - static boolean isFile(String ns) { - return ns.startsWith("/"); - } - - static String toFile(String ns) { - return "file://" + ns; - } - - public static boolean reject(Feature feature) { - return ! accept(feature); - } - - - public static Level getLevel(Level actionLevel) { - return actionLevel; - } - - /** - * Used by server to grant access right to server query (user query or system query) - * user = true : user query coming from http request - * Return access level granted to query - */ - public static Level getQueryAccessLevel(boolean user) { - return getQueryAccessLevel(user, false); - } /** * return access level granted to user query @@ -381,15 +325,6 @@ public static Level getQueryAccessLevel(boolean user, boolean hasKey) { - public static void setLinkedFeature(boolean b) { - setLinkedFunction(b); - setLinkedTransformation(b); -// setLinkedRule(b); - } - - public static void setReadFile(boolean b) { - setFeature(READ_FILE, b); - } public static void setFeature(Feature feature, boolean b) { if (b) { @@ -410,10 +345,6 @@ public static void setLinkedTransformation(boolean b) { setFeature(LINKED_TRANSFORMATION, b); } - // everything is forbiden to DEFAULT level - public static void restrict() { - singleton = new Access(DENIED); - } public static Mode getMode() { @@ -426,9 +357,6 @@ public static void setMode(Mode m) { //logger.info("setMode : ", singleton); } - public static boolean isServerMode() { - return mode == SERVER; - } void initMode() { switch (mode) { @@ -493,21 +421,6 @@ void init() { set(READ, PUBLIC); } - /** - * protected mode: - * some features are protected - * - */ - public static void protect() { - setProtect(true); - deny(READ_WRITE); - deny(WRITE); - deny(SUPER_WRITE); - deny(HTTP); - deny(JAVA_FUNCTION); - deny(LINKED_FUNCTION); - // other features are PRIVATE and user query is PUBLIC - } /** * @return the protect diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessNamespace.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessNamespace.java index bce762baa..0487edcc7 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessNamespace.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessNamespace.java @@ -46,10 +46,6 @@ void init() { } } - public static void clean() { - singleton().clear(); - singleton().init(); - } public static AccessNamespace singleton() { return singleton; @@ -82,9 +78,6 @@ public static boolean forbidden(String ns) { return singleton().forbid.match(ns); } - public static boolean access(String ns) { - return singleton().accept(ns); - } public static boolean access(String ns, boolean resultWhenEmptyAccept) { return singleton().accept(ns, resultWhenEmptyAccept); } 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..b98d31bda 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 @@ -103,18 +103,6 @@ public AccessRight() { split(); } - public AccessRight(AccessRights access) { - this(); - setAccess(access); - } - - public AccessRight(AccessRights delete, AccessRights insert, AccessRights where) { - this(); - setDefine(insert); - setDelete(delete); - setInsert(insert); - setWhere(where); - } @Override public String toString() { @@ -129,22 +117,11 @@ public AccessRight split() { return this; } - public void inheritDefault() { - getAccessRightDefinition().inheritDefault(); - } - - public void splitInheritDefault() { - getInsertRightDefinition().inheritDefault(); - getDeleteRightDefinition().inheritDefault(); - } public static boolean accept(AccessRights right) { return right != AccessRights.NONE; } - public static boolean reject(AccessRights right) { - return right == AccessRights.NONE; - } @@ -190,9 +167,6 @@ public static boolean accept(AccessRights query, AccessRights target) { } } - public static boolean reject(AccessRights query, AccessRights target) { - return ! accept(query, target); - } /** * Use case: delete target edge @@ -201,9 +175,6 @@ public static boolean acceptDelete(Edge query, Edge target) { return ! isActive() || accept(query.getLevel(), target.getLevel()); } - public static boolean acceptDeleteStatus(Edge query, Edge target) { - return isSuperUser(query.getLevel()); - } // specific test for query = target = 0 public static boolean acceptBI(AccessRights query, AccessRights target) { @@ -237,13 +208,6 @@ public boolean setInsert(Edge edge) { } - public void setDeleteBasic(Edge edge) { - edge.setLevel(getDelete()); - } - - public void setInsertBasic(Edge edge) { - edge.setLevel(getInsert()); - } public void setInsertNS(Edge edge) { edge.setLevel(getInsertRightDefinition().getAccess(edge, getDefine())); @@ -253,12 +217,6 @@ public void setDeleteNS(Edge edge) { edge.setLevel(getDeleteRightDefinition().getAccess(edge, getDelete())); } - /** - * @return the update - */ - public boolean isUpdate() { - return update; - } // Called by Construct public boolean isInsert() { @@ -269,12 +227,6 @@ public boolean isDelete() { return accept(getDelete()); } - /** - * @param update the update to set - */ - public void setUpdate(boolean update) { - this.update = update; - } /** * @return the delete @@ -304,15 +256,6 @@ public void setInsert(AccessRights insert) { this.insert = insert; } - /** - * to be used in order to align the insert clause - * with the define clause - * - */ - public void setDefineInsert(AccessRights insert) { - setDefine(insert); - setInsert(insert); - } /** * @return the where @@ -372,26 +315,6 @@ public void setDeleteRightDefinition(AccessRightDefinition accessRightDefinition this.deleteRightDefinition = accessRightDefinition; } - /** - * @return the AccessRights enum value corresponding to the given URI string, NONE if not found - */ - public static AccessRights getLevel(String level) { - if(level.equalsIgnoreCase(AccessRights.UNDEFINED.getURI())) { - return AccessRights.UNDEFINED; - } else if(level.equalsIgnoreCase(AccessRights.PUBLIC.getURI())) { - return AccessRights.PUBLIC; - } else if(level.equalsIgnoreCase(AccessRights.PRIVATE.getURI())) { - return AccessRights.PRIVATE; - } else if(level.equalsIgnoreCase(AccessRights.PROTECTED.getURI())) { - return AccessRights.PROTECTED; - } else if(level.equalsIgnoreCase(AccessRights.RESTRICTED.getURI())) { - return AccessRights.RESTRICTED; - } else if(level.equalsIgnoreCase(AccessRights.SUPER_USER.getURI())) { - return AccessRights.SUPER_USER; - } else { - return AccessRights.NONE; - } - } /** * @return the AccessRights enum value corresponding to the given byte value, NONE if not found @@ -414,13 +337,6 @@ public static AccessRights getLevel(byte byteValue) { } } - public static void setMode(String mode) { - switch (mode) { - case EQ_ACCESS_MODE: eqMode(); break; - case BI_ACCESS_MODE: biMode(); break; - default: gtMode(); break; - } - } public static int getMode() { return mode; @@ -443,34 +359,6 @@ public static void biMode() { } - /** - * @return the debug - */ - public boolean isDebug() { - return debug; - } - - /** - * @param debug the debug to set - */ - public void setDebug(boolean debug) { - this.debug = debug; - getAccessRightDefinition().setDebug(debug); - } - - /** - * @return the inheritDefault - */ - public static boolean isInheritDefault() { - return inheritDefault; - } - - /** - * @param aInheritDefault the inheritDefault to set - */ - public static void setInheritDefault(boolean aInheritDefault) { - inheritDefault = aInheritDefault; - } /** * @return the define @@ -516,10 +404,6 @@ public void setWhereMax(AccessRights whereMax) { this.whereMax = whereMax; } - public void setWhere(AccessRights min, AccessRights max) { - setWhereMin(min); - setWhereMax(max); - } /** * @return the whereList @@ -528,12 +412,6 @@ public AccessRights[] getWhereList() { return whereList; } - /** - * @param whereList the whereList to set - */ - public void setWhereList(AccessRights... whereList) { - this.whereList = whereList; - } } 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..79012e3ff 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 @@ -31,10 +31,6 @@ public class AccessRightDefinition { public class AccessMap extends HashMap { - public AccessMap define(String uri, AccessRight.AccessRights b) { - put(uri, b); - return this; - } /** * return URI access right if any @@ -96,11 +92,6 @@ public void inheritDefault() { setInheritDefault(true); } - public void clear() { - getNodeAccess().clear(); - getPredicateAccess().clear(); - getGraphAccess().clear(); - } public void inherit(AccessRightDefinition acc) { getNodeAccess().inherit(acc.getNodeAccess()); @@ -140,28 +131,11 @@ AccessRight.AccessRights getAccessDirect(Edge edge) { return combine(getSubject(edge), combine(getObject(edge), combine(getPredicate(edge), getGraph(edge)))); } - /** - * Namespace of current overload URI of default - */ - AccessRight.AccessRights getAccessWithDefault(Edge edge) { - AccessRight.AccessRights subject = get(getSubject(edge), getSingleton().getSubject(edge)); - AccessRight.AccessRights object = get(getObject(edge), getSingleton().getObject(edge)); - AccessRight.AccessRights pred = get(getPredicate(edge), getSingleton().getPredicate(edge)); - AccessRight.AccessRights graph = get(getGraph(edge), getSingleton().getGraph(edge)); - return combine(subject, combine(object, combine(pred, graph))); - } AccessRight.AccessRights get(AccessRight.AccessRights current, AccessRight.AccessRights defaut) { return (current == null) ? defaut : current; } - AccessRight.AccessRights getAccess2(Edge edge, AccessRight.AccessRights def) { - AccessRight.AccessRights res = getAccessOrDefault(edge); - if (res == null) { - return def; - } - return res; - } AccessRight.AccessRights getAccessOrDefault(Edge edge) { AccessRight.AccessRights res = getAccessBasic(edge); @@ -213,15 +187,6 @@ AccessRight.AccessRights moreRestricted(AccessRight.AccessRights b1, AccessRight return (b1.getByteValue() > b2.getByteValue()) ? b1 : b2; } - AccessRight.AccessRights lessRestricted(AccessRight.AccessRights b1, AccessRight.AccessRights b2) { - if (b1 == null) { - return b2; - } - if (b2 == null) { - return b1; - } - return b1.getByteValue() < b2.getByteValue() ? b1 : b2; - } // return null when there is no uri access right @@ -257,12 +222,6 @@ public AccessMap getNode() { return getNodeAccess(); } - /** - * @param nodeAccess the nodeAccess to set - */ - public void setNode(AccessMap nodeAccess) { - this.setNodeAccess(nodeAccess); - } /** * @return the graphAccess @@ -271,12 +230,6 @@ public AccessMap getGraph() { return getGraphAccess(); } - /** - * @param graphAccess the graphAccess to set - */ - public void setGraph(AccessMap graphAccess) { - this.setGraphAccess(graphAccess); - } /** * @return the predicateAccess @@ -285,19 +238,6 @@ public AccessMap getPredicate() { return getPredicateAccess(); } - /** - * @param predicateAccess the predicateAccess to set - */ - public void setPredicate(AccessMap predicateAccess) { - this.setPredicateAccess(predicateAccess); - } - - /** - * @return the debug - */ - public boolean isDebug() { - return debug; - } /** * @param debug the debug to set @@ -362,12 +302,6 @@ public void setPredicateAccess(AccessMap predicateAccess) { this.predicateAccess = predicateAccess; } - /** - * @return the inheritDefault - */ - public boolean isInheritDefault() { - return inheritDefault; - } /** * @param inheritDefault the inheritDefault to set diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/And.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/And.java old mode 100755 new mode 100644 index 5aca30dc2..e50853b0b --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/And.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/And.java @@ -33,13 +33,6 @@ public And(Exp exp1, Exp exp2){ add(exp2); } - public static And create(Exp exp1){ - return new And(exp1); - } - - public static And create(Exp exp1, Exp exp2){ - return new And(exp1, exp2); - } @Override public boolean isAnd(){ @@ -71,9 +64,6 @@ public boolean validate(ASTQuery ast, boolean exist){ - String getOper() { - return Keyword.SEAND; - } public boolean isStack() { return stack; 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 old mode 100755 new mode 100644 index 0a665c7b3..2a7584200 --- 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 @@ -123,37 +123,21 @@ public boolean isResource() { return false; } - public boolean isIsall() { - return isall; - } - - public void setIsall(boolean isall) { - this.isall = isall; - } public boolean isIsdirect() { return isdirect; } - public void setIsdirect(boolean isdirect) { - this.isdirect = isdirect; - } public boolean isIsone() { return isone; } - public void setIsone(boolean isone) { - this.isone = isone; - } public int getStar() { return star; } - public void setPath(int star) { - this.star = star; - } @Override public Atom getAtom() { @@ -170,9 +154,6 @@ public IDatatype getDatatypeValue() { return null; } - public Atom getElement() { - return this; - } boolean validateData(ASTQuery ast) { if (isBlankOrBlankNode()) { diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/BasicGraphPattern.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/BasicGraphPattern.java old mode 100755 new mode 100644 index 36825a724..45c3e1474 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/BasicGraphPattern.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/BasicGraphPattern.java @@ -192,13 +192,6 @@ public void addFilter(Expression e) { add(e); } - public BasicGraphPattern duplicate() { - BasicGraphPattern bgp = new BasicGraphPattern(); - for (Exp exp : this) { - bgp.add(exp); - } - return bgp; - } @Override public boolean isBGP() { @@ -213,39 +206,6 @@ public ASTBuffer toString(ASTBuffer sb) { return sb; } - public ASTBuffer toStringBasic() { - ASTBuffer sb = new ASTBuffer(); - super.toString(sb); - return sb; - } - - /** - * This function add a new blank bode in the hashtable bnodes - * - * @param s1 The name of the blank node in the query - * @param v The new blank node - */ - public void addBNodes(String s1, Variable v) { - if (bnodes == null) { - bnodes = new Hashtable(); - } - bnodes.put(s1, v); - } - - /** - * This function return the blank node that corresponds to the string s in - * the BasicGraphPattern part of the query - * - * @param s The name of the blank node in the query - * @return - */ - public Variable getBNode(String s) { - if (bnodes == null) { - return null; - } else { - return bnodes.get(s); - } - } /** * To check that inner optional have their variable bound by their embeding @@ -332,29 +292,6 @@ public boolean validate(ASTQuery ast, boolean exist) { return ok; } - public boolean validate2(ASTQuery ast, boolean exist) { - boolean ok = true; - List list = null; - - for (Exp exp : getBody()) { - if (exp.isBGP()) { - // in a new BGP, there is no binding - list = ast.getStack(); - ast.newStack(); - } - - boolean b = exp.validate(ast, exist); - if (!b) { - ok = false; - } - - if (exp.isBGP()) { - ast.addStack(list); - } - } - - return ok; - } /** * SPARQL Constraint: Two occurrences of same blank must not be separated by 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 old mode 100755 new mode 100644 index 8940a56af..2b14de6e2 --- 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 @@ -108,17 +108,6 @@ public static Constant create(int n) { return new Constant(Integer.toString(n), RDFS.xsdinteger); } - public static Constant create(long n) { - return new Constant(Long.toString(n), RDFS.xsdinteger); - } - - public static Constant create(double d) { - return new Constant(Double.toString(d), RDFS.xsddouble); - } - - public static Constant create(float d) { - return new Constant(Float.toString(d), RDFS.xsdfloat); - } public static Constant create(boolean b) { return new Constant((b) ? "true" : "false", RDFS.xsdboolean); @@ -141,9 +130,6 @@ public String getDatatype() { return datatype; } - void setDatatype(String str) { - datatype = str; - } boolean hasRealDatatype() { if (datatype == null) { @@ -172,9 +158,6 @@ public void toJava(JavaCompiler jc, boolean arg) { jc.toJava(this, arg); } - public static void setString(boolean b) { - stringDatatype = b; - } static boolean isString() { return stringDatatype ; @@ -242,10 +225,6 @@ else if (datatype.equals(RDF.qxsdInteger) return sb; } - public StringBuffer toString2(StringBuffer sb) { - sb.append(getDatatypeValue().toString()); - return sb; - } /** * Escape special chars Add surrounding quotes to a string literal @@ -342,9 +321,6 @@ public boolean equals(Constant c) { return getDatatypeValue().sameTerm(c.getDatatypeValue()); } - static String getJavaType(String datatypeURI) { - return dm.getJType(nsm().toNamespace(datatypeURI)); - } @Override public IDatatype getDatatypeValue() { @@ -374,12 +350,6 @@ public static Constant create(IDatatype dt) { return cst; } - public static Constant createList(Constant cst) { - IDatatype dt = cst.getDatatypeValue(); - IDatatype list = DatatypeMap.newList(dt); - Constant res = Constant.create(list); - return res; - } @Override public Constant duplicate() { @@ -452,9 +422,6 @@ public int getWeight() { return weight; } - public boolean isNumber() { - return dt.isNumber(); - } @Override public boolean isResource() { @@ -482,9 +449,6 @@ public Variable getIntVariable() { return var; } - public boolean isQName() { - return isQName; - } public void setQName(boolean isQName) { this.isQName = isQName; 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 b2e2560a4..05bc71cf5 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 @@ -119,10 +119,6 @@ public Context(Access.Level level) { setLevel(level); } - public Context(AccessRight access) { - this(); - setAccessRight(access); - } @Override public String toString() { @@ -173,11 +169,6 @@ public Collection keys(){ return table.keySet(); } - public Context copy(){ - Context c = new Context(); - c.copy(this); - return c; - } public void complete(Context source) { IDatatype export = source.get(Context.STL_EXPORT); @@ -252,23 +243,6 @@ public IDatatype getDatatypeValue(){ return DatatypeMap.createObject(this); } - public IDatatype getNamedContextList() { - ArrayList list = new ArrayList<>(); - if (getNamedContext() != null) { - for (String name : getNamedContext().keySet()) { - list.add(DatatypeMap.newResourceOrLiteral(name)); - } - } - return DatatypeMap.newInstance(list); - } - - public IDatatype getNamedContextDatatypeValue(String name) { - if (getNamedContext() == null || getContext(name) == null) { - return null; - } - Context c = getContext(name); - return c.getDatatypeValue(); - } public IDatatype cget(IDatatype name, IDatatype slot){ return getContext(name).get(slot); @@ -301,9 +275,6 @@ public Context set(String name, IDatatype value) { return this; } - public Context setName(String name, IDatatype value) { - return set(NSManager.STL+name, value); - } public Context export(String name, IDatatype value) { table.put(name, value); @@ -328,9 +299,6 @@ public void defineExport() { } - public Context exportName(String name, IDatatype value) { - return export(NSManager.STL+name, value); - } public Context set(String name, String str) { if (str == null) { @@ -418,94 +386,29 @@ public Context setURI(String name, String str) { return this; } - public Context setTransform(String str) { - return setURI(STL_TRANSFORM, str); - } - - public String getTransform() { - return stringValue(STL_TRANSFORM); - } - - public Context setURI(String str) { - return setURI(STL_URI, str); - } - - public Context setMode(String str) { - return setURI(STL_MODE, str); - } - - public Context setParam(String str) { - return set(STL_PARAM, str); - } - - public Context setFormat(String str) { - return setURI(STL_FORMAT, str); + public String getProfile() { + return stringValue(STL_PROFILE); } public String getURI() { return stringValue(STL_URI); } - public Context setProtocol(String str){ - return setURI(STL_PROTOCOL, str); - } public Context setQueryString(String str) { return set(STL_QUERY, str); } - // add values clause to query - public Context addValue(String value) { - String squery = getQueryString(); - if (getURI() == null && squery != null) { - setQueryString(squery + value); - } - return this; - } public String getQueryString() { return stringValue(STL_QUERY); } - public Context setName(String str) { - return setURI(STL_NAME, str); - } - - public String getName() { - return stringValue(STL_NAME); - } - - public Context setService(String str) { - return set(STL_SERVICE, str); - } - - public Context setServer(String str) { - return setURI(STL_SERVER, str); - } - - public Context setRemoteHost(String remoteHost) { - return set(STL_REMOTE_HOST, remoteHost); - } - - public Context setTitle(String str) { - return setURI(STL_TITLE, str); - } - - public Context setTitle(IDatatype dt) { - return set(STL_TITLE, dt); - } public String getService() { return stringValue(STL_SERVICE); } - public Context setLang(String str) { - return set(STL_LANG, str); - } - - public String getLang() { - return stringValue(STL_LANG); - } public IDatatype get(String name) { @@ -564,41 +467,11 @@ public boolean isList(String name) { } - public boolean hasValue(String name, String value) { - IDatatype dt = table.get(name); - return dt != null && dt.getLabel().equals(value); - } - - public boolean hasValue(String name, IDatatype value) { - IDatatype dt = table.get(name); - return dt != null && dt.equals(value); - } public boolean hasValue(String name) { return get(name) != null; } - public boolean hasEveryValue(String... name) { - for (String key : name) { - if (! hasValue(key)) { - return false; - } - } - return true; - } - - public boolean hasAnyValue(String... name) { - for (String key : name) { - if (hasValue(key)) { - return true; - } - } - return false; - } - - public IDatatype getName(String name) { - return get(NSManager.STL+name); - } public String stringValue(String name) { IDatatype dt = table.get(name); @@ -634,9 +507,6 @@ public void setUserQuery(boolean userQuery) { this.userQuery = userQuery; } - public void setServerProfile(IDatatype obj) { - set(STL_SERVER_PROFILE, obj); - } @Override public PointerType pointerType(){ @@ -676,27 +546,6 @@ public void setNamedContext(HashMap context) { this.context = context; } - /** - * @return the bind - */ - public Binding getBind() { - return bind; - } - - /** - * @param bind the bind to set - */ - public Context setBind(Binding bind) { - this.bind = bind; - return this; - } - - /** - * @return the debug - */ - public boolean isDebug() { - return debug; - } /** * @param debug the debug to set @@ -819,26 +668,6 @@ public Context inherit(Context ct) { } - /** - * mode=demo - * get parameter value list of demo (from global Context from urlprofile.ttl) - * get value of parameter name in parameter value list - */ - public String getDefaultValue(List modeList, String name) { - for (String mode : modeList) { - // get value of parameter name in parameter list of mode - IDatatype dt = getValueInList(mode, name); - if (dt != null) { - return dt.getLabel(); - } - } - // try default mode * (use case: query parameter is required before any context & default processing) - IDatatype dt = getValueInList(STAR, name); - if (dt != null) { - return dt.getLabel(); - } - return null; - } /** * Get parameter values associated to endpoint URL or to mode in server global Context gc @@ -913,30 +742,6 @@ void basicMode(Context gc, String name, String value) { } } - /** - * name = st:all - * return (st:xml st:json) - * from urlprofile.ttl transformation st:equivalent definition - * PRAGMA: this Context is server global Context - */ - public void prepare(String name, List list) { - name = nsm().toNamespace(name); - List alist = getStringList(name); - if (alist == null) { - list.add(name); - } else { - list.addAll(alist); - } - } - - String complete(String uri, String key, String val) { - if (uri.contains("?")) { - uri = String.format("%s&%s=%s", uri, key, val); - } else { - uri = String.format("%s?%s=%s", uri, key, val); - } - return uri; - } public String getKey() { return key; @@ -946,12 +751,6 @@ public void setKey(String key) { this.key = key; } - public String getCreateKey() { - if (getKey() == null) { - setKey(UUID.randomUUID().toString()); - } - return getKey(); - } public HashMap getHashMap() { return table; @@ -961,25 +760,11 @@ public Collection keySet() { return getHashMap().keySet(); } - public JSONObject json() { - JSONObject json = new JSONObject(); - - for (String key : keySet()) { - IDatatype dt = get(key); - DatatypeMap.set(json, key, dt); - } - - return json; - } public ASTQuery getAST() { return ast; } - public Context setAST(ASTQuery ast) { - this.ast = ast; - return this; - } public boolean isFederateIndex() { return federateIndex; @@ -990,9 +775,6 @@ public Context setFederateIndex(boolean federateIndex) { return this; } - public boolean isDiscovery() { - return discovery; - } public Context setDiscovery(boolean discovery) { this.discovery = discovery; 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..8475e362a 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 @@ -77,11 +77,6 @@ public static Dataset create(Context c) { return new Dataset(c); } - public static Dataset create(ProcessVisitor vis) { - Dataset ds = new Dataset(); - ds.setVisitor(vis); - return ds; - } public static Dataset create(Binding b) { Dataset ds = new Dataset(); @@ -89,12 +84,6 @@ public static Dataset create(Binding b) { return ds; } - public static Dataset create(List f, List n) { - if (f == null && n == null) { - return null; - } - return new Dataset(f, n); - } public static Dataset newInstance(List f, List n) { if (f == null && n == null) { @@ -103,16 +92,6 @@ public static Dataset newInstance(List f, List n) { return newInstance(f, n); } - public static Dataset instance(List f, List n) { - List from = null, named = null; - if (f != null) { - from = cast(f); - } - if (n != null) { - named = cast(n); - } - return new Dataset(from, named); - } static List cast(List list) { ArrayList from = new ArrayList<>(); @@ -194,19 +173,6 @@ public Dataset addNamed(String s) { } - public Dataset remFrom(String s) { - if (getFrom() != null) { - getFrom().remove(Constant.create(s)); - } - return this; - } - - public Dataset remNamed(String s) { - if (getNamed() != null) { - getNamed().remove(Constant.create(s)); - } - return this; - } public void addFrom(Constant s) { if (getFrom() == null) { @@ -244,12 +210,6 @@ public Context getContext() { return context; } - public Context getCreateContext() { - if (getContext() == null) { - setContext(new Context()); - } - return getContext(); - } public void setContext(Context context) { @@ -264,17 +224,6 @@ public Dataset setLevel(Level level) { return this; } - public Level getLevel() { - if (getContext() == null) { - return Level.USER_DEFAULT; - } - return getContext().getLevel(); - } - - public Dataset set(Context c) { - setContext(c); - return this; - } @Override public PointerType pointerType() { @@ -341,13 +290,6 @@ public Mapping call(Mapping m) { return m; } - public void setTemplateVisitor(Object vis) { - templateVisitor = vis; - } - - public Object getTemplateVisitor() { - return templateVisitor; - } public void setFrom(List from) { @@ -381,14 +323,6 @@ public void setBinding(Binding binding) { } - public List getUriList() { - return uriList; - } - - - public void setUriList(List uriList) { - this.uriList = uriList; - } public Metadata getMetadata() { return metadata; @@ -403,10 +337,6 @@ public boolean isLoad() { return load; } - public Dataset setLoad(boolean load) { - this.load = load; - return this; - } public ProcessVisitor getVisitor() { return visitor; @@ -480,9 +410,6 @@ public List getIndex() { return index; } - public void setIndex(List index) { - this.index = index; - } public String getStoragePath() { return storagePath; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Exp.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Exp.java old mode 100755 new mode 100644 index a30f2b087..3f42c4377 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Exp.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Exp.java @@ -267,17 +267,6 @@ Bind validate(Bind env, int n) throws QuerySemanticException { return env; } - public void append(Exp e) { - add(e); - } - - public void append(Expression e) { - add(e); - } - - boolean isRegexp(String uri) { - return uri.indexOf(".*") != -1; - } // void process(ASTQuery aq){ // aq.setQuery(this); @@ -295,11 +284,6 @@ public Exp copy() { return this; } - void setNegation(boolean b) { - } - - void setCard(String card) { - } public void setRec(boolean b) { } @@ -309,12 +293,6 @@ public ASTBuffer toString(ASTBuffer sb) { return display(sb); } - Exp myget(int i) { - if (i >= size()) { - return null; - } - return get(i); - } public ASTBuffer display(ASTBuffer sb) { int i = 0; @@ -372,9 +350,6 @@ public boolean isFilter() { return false; } - public boolean isStatement() { - return isBGP() || isUnion() || isMinus() || isOptional() || isGraph(); - } public boolean isOption() { return false; @@ -460,9 +435,6 @@ public boolean isService() { return false; } - public boolean isScore() { - return false; - } public boolean isQuery() { return false; @@ -476,17 +448,6 @@ public boolean isScope() { return false; } - public boolean isNegation() { - return false; - } - - public boolean isForall() { - return false; - } - - public boolean isIfThenElse() { - return false; - } public boolean isExist() { return false; @@ -551,10 +512,6 @@ public boolean validateDelete() { return true; } - @Override - public void accept(ASTVisitor visitor) { - visitor.visit(this); - } /** * Searching filters (localize()) @@ -608,9 +565,6 @@ public List getRDFList(List list) { return new ExtractList().getRDFList(this, list); } - public List getBGPWithBnodeVariable(List list) { - return new ExtractList().getBGPWithBnodeVariable(this, list); - } public List getBGPWithBnodeVariable(List list, FederateMerge fm) { return new ExtractList().getBGPWithBnodeVariable(this, list, fm); 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 old mode 100755 new mode 100644 index c20fe8f74..9487dd85e --- 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 @@ -122,17 +122,6 @@ public Expression prepare(ASTQuery ast) throws EngineException { return this; } - public Expression and(Expression e2) { - if (e2 == null) { - return this; - } else { - return Term.create(Keyword.SEAND, this, e2); - } - } - - public Expression star() { - return Term.function(Term.STAR, this); - } @Override public String getShortName() { @@ -170,9 +159,6 @@ public Expression getExpr() { return exp; } - public String getKey() { - return toString(); - } public void setName(String str) { name = str; @@ -216,9 +202,6 @@ public boolean isDynamic() { public void setPublic(boolean b) { } - public boolean isArray() { - return false; - } boolean isAtom() { return false; @@ -255,10 +238,6 @@ public boolean isBlankNode() { return false; } - // because triple reference is BlankNode - public boolean isStrictBlankNode() { - return isBlankNode() && ! isTriple(); - } public boolean isTerm() { return false; @@ -284,9 +263,6 @@ public boolean isFunction() { return false; } - public boolean isTemplate() { - return false; - } @Override public boolean isFuncall() { @@ -318,9 +294,6 @@ public String getDatatype() { return null; } - public String getSrcDatatype() { - return null; - } public boolean isAnd() { return false; @@ -413,9 +386,6 @@ public boolean isCounter() { return false; } - boolean isOrVarEqCst(Variable var) { - return false; - } @Override public boolean isStar() { @@ -471,9 +441,6 @@ public boolean isType(ASTQuery ast, Expression.Type type) { return false; } - public boolean isType(ASTQuery ast, Variable var, int type) { - return false; - } public boolean isVisited() { return false; @@ -530,13 +497,6 @@ public void toJava(JavaCompiler jc, boolean arg) { jc.toJava(this, arg); } - /** - * Translate some terms like : different(?x ?y ?z) -> (?x != ?y && ?y != ?z - * && ?x != ?z) - */ - public Expression process() { - return this; - } /** * use case: select fun(?x) as ?y rewrite occurrences of ?y as fun(?x) @@ -545,9 +505,6 @@ public Expression process(ASTQuery ast) { return this; } - public Expression rewrite() { - return this; - } /** * *********************************************************** @@ -599,28 +556,6 @@ public boolean isBound(List varList) { return true; } - public boolean isBound2(List varList) { - List list = getVariables(); - for (String name : list){ - boolean bound = false; - for (Variable var : varList) { - if (name.equals(var.getLabel())) { - bound = true; - break; - } - } - if (! bound) { - return false; - } - } - return true; - } - - public List getConstants() { - ArrayList l = new ArrayList(); - getConstants(l); - return l; - } void getConstants(List l) { } @@ -899,10 +834,6 @@ public String getModality() { public void setModality(String mod) { } - @Override - public void accept(ASTVisitor visitor) { - visitor.visit(this); - } public void walk(Walker walker) { //logger.debug("walk exp: {}" , this); @@ -954,9 +885,6 @@ public List getMetadataValues(String name) { return null; } - public boolean hasMetadata(int type) { - return false; - } @Override public Collection getMetadataList() { @@ -1026,9 +954,6 @@ public void setAST(ASTQuery ast) { this.ast = ast; } - public boolean hasAST() { - return ast != null; - } @Override public PointerType pointerType() { @@ -1063,9 +988,6 @@ public IDatatype eval(Computer eval, Binding b, Environment env, Producer p, IDa return null; } - public IDatatype eval(Computer eval, Environment env, Producer p) { - return eval(eval, env, p, new IDatatype[0]); - } public IDatatype eval(Computer eval, Environment env, Producer p, IDatatype[] param) { return null; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ExpressionList.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ExpressionList.java old mode 100755 new mode 100644 index 039ce398f..f7f7c6c7a --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ExpressionList.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ExpressionList.java @@ -41,10 +41,6 @@ public ExpressionList(Expression e) { add(e); } - public ExpressionList(List l) { - this(); - addAll(l); - } public void setDistinct(boolean b){ isDistinct = b; @@ -96,9 +92,6 @@ public boolean isNested() { return ! list.isEmpty() || nested; } - public void setNested(boolean b){ - nested = b; - } /** * @return the list @@ -107,12 +100,6 @@ public List getList() { return list; } - /** - * @param list the list to set - */ - public void setList(List list) { - this.list = list; - } public void add(ExpressionList l){ list.add(l); diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ExtractList.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ExtractList.java index 0fe6cc1d3..485a8f513 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ExtractList.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ExtractList.java @@ -45,16 +45,6 @@ List bgpMerge(Exp exp, List list, Federate } // @todo - // s p [ q r ] . s q v - // bgp = s p [q r] - // merge s q v in bgp because it share variable s with bgp - List bgpComplete(Exp exp, List list, FederateMerge fm) { - for (Exp ee : exp) { - if (ee.isTriple()) { - } - } - return list; - } @Override public boolean merge(Triple t) { diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/HashMapList.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/HashMapList.java index fe96439c3..1d92c40f1 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/HashMapList.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/HashMapList.java @@ -37,12 +37,5 @@ public void add(String key, T val) { } } - public boolean booleanValue(String key) { - T value = getFirst(key); - if (value == null) { - return false; - } - return value.toString().equals(TRUE); - } } diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Join.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Join.java index dbe2a7ce5..84829fade 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Join.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Join.java @@ -2,12 +2,6 @@ public class Join extends And { - public static Join create(Exp e1, Exp e2){ - Join e = new Join(); - e.add(e1); - e.add(e2); - return e; - } @Override diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/LoadTurtle.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/LoadTurtle.java index 73a929f0f..a1bba8b76 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/LoadTurtle.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/LoadTurtle.java @@ -46,35 +46,12 @@ public class LoadTurtle { setLoader(r, c, base); } - public static LoadTurtle create(InputStream read, Creator cr, String base) { - LoadTurtle p = new LoadTurtle(read, cr, base); - return p; - } public static LoadTurtle create(Reader read, Creator cr, String base) { LoadTurtle p = new LoadTurtle(read, cr, base); return p; } - public static LoadTurtle create(String file, Creator cr) { - FileReader read; - try { - read = new FileReader(file); - LoadTurtle p = new LoadTurtle(read, cr, file); - return p; - } catch (FileNotFoundException e) { - logger.error("Operation failure", e); - } - return null; - } - - void setCreator(Creator c) { - create = c; - } - - public Creator getCreator() { - return create; - } private void setLoader(InputStream stream, Creator c, String base) { parser = new SparqlCorese(stream); 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..c9f0266d3 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 @@ -290,10 +290,6 @@ public Metadata selectSparql() { return null; } - public Metadata share(Metadata meta) { - add(meta); - return this; - } public Metadata add(String str) { map.put(str, str); @@ -336,12 +332,6 @@ public void add(String name, String val) { } } - public void set(Type type, List list) { - String name = name(type); - if (name != null) { - set(name, list); - } - } public void set(String name, List list) { if (!list.isEmpty()) { @@ -378,23 +368,6 @@ public boolean hasMetadata(Type type) { return hasMetadata(str); } - public boolean hasMetadata(Type... type) { - for (Type val : type) { - if (hasMetadata(val)) { - return true; - } - } - return false; - } - - public boolean hasMetadata(String... type) { - for (String val : type) { - if (hasMetadata(val)) { - return true; - } - } - return false; - } public boolean hasMetadata(String name) { return map.containsKey(name); @@ -412,9 +385,6 @@ public void add(Metadata m) { } } - public HashMap getMap() { - return map; - } public String getValue(Type type) { return getValue(name(type)); @@ -428,21 +398,6 @@ public IDatatype getDatatypeValue(String type) { return literal.get(type); } - public int intValue(Type type) { - IDatatype dt = getDatatypeValue(type); - if (dt == null) { - return -1; - } - return dt.intValue(); - } - - public boolean hasDatatypeValue(Type type) { - return getDatatypeValue(type) != null; - } - - public boolean hasDatatypeValue(String type) { - return getDatatypeValue(type) != null; - } public String getStringValue(Type type) { String value = getValue(type); @@ -560,27 +515,5 @@ public void setMetadata(Metadata metadata) { // ________________________________________________ - // @graph - public List getGraphList(String service) { - List graphList = getValues(Type.FROM); - List serverList = getValues(Type.FEDERATE); - ArrayList res = new ArrayList<>(); - boolean find = false; - if (graphList != null && serverList != null) { - for (String str : graphList) { - if (find) { - if (serverList.contains(str)) { - break; - } else { - res.add(str); - } - } else if (str.equals(service)) { - find = true; - } - } - } - - return res; - } } 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 old mode 100755 new mode 100644 index e8689a242..0ad2bd7ba --- 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 @@ -236,38 +236,12 @@ public NSManager copy() { return nsm; } - /** - * Import nsm definitions - */ - public NSManager complete(NSManager nsm) { - if (getBase() == null) { - setBase(nsm.getBase()); - } - for (String p : nsm.getPrefixSet()) { - definePrefix(p, nsm.getNamespace(p)); - } - return this; - } public void init() { initDefault(); defNamespace(); } - public Iterable getNamespaces() { - return tns.keySet(); - } - - public Iterable getPrefixes() { - return getPrefixEnum(); - } - - public void clear() { - tns.clear(); - index.clear(); - tprefix.clear(); - count = 0; - } /** * application specific namespace/prefix if any @@ -351,13 +325,6 @@ public boolean isSystemURI(String uri) { return isSystem(namespace(uri)); } - public boolean isNamespace(String ns) { - return tns.containsKey(ns); - } - - public static boolean isNumber(String ns) { - return number.get(ns) != null; - } /** * Define a namespace, returns the prefix @@ -441,12 +408,6 @@ public Set getPrefixSet() { return tprefix.keySet(); } - public int getIndex(String ns) { - if (getPrefix(ns) == null) { - defNamespace(ns); - } - return index.get(ns); - } public String toPrefix(String nsname) { return toPrefix(nsname, false); @@ -459,13 +420,6 @@ public String toPrefixXML(String nsname) { return toPrefix(nsname, false, true); } - /** - * toPrefix() unless there are forbidden characters such as ( ) in this case - * return - */ - public String toPrefixURI(String nsname) { - return toPrefixURI(nsname, true); - } public String toPrefixURI(String nsname, boolean skip) { return toPrefixURI(nsname, skip, false); @@ -613,13 +567,6 @@ public String toBase(String str) { return str; } - boolean isAbsoluteURI(String s) { - try { - return new URI(s).isAbsolute(); - } catch (URISyntaxException e) { - } - return false; - } String resolve(String str) { if (str.equals("")) { @@ -642,13 +589,6 @@ public String toString() { return toString(null, false, true); } - public String toString(String title) { - return toString(title, false, true); - } - - public String toString(String title, boolean all) { - return toString(title, all, true); - } public String toString(String title, boolean all, boolean bas) { if (title == null) { @@ -780,23 +720,6 @@ public String getQNamespace(String pname) { return null; } - public String getPackage(String qname) { - String ns = getQNamespace(qname); - int ind = ns.indexOf(KeywordPP.CORESE_PREFIX); - if (ind != 0) { - return ns; - } - ns = ns.substring(KeywordPP.CORESE_PREFIX.length()); - if (ns.endsWith(".")) { - ns = ns.substring(0, ns.length() - 1); - } - return ns; - - } - - public String toNamespaceBN(String str) { - return toNamespaceB(str); - } @Override public int size() { @@ -807,13 +730,6 @@ public boolean isUserDefine() { return size() > def.size(); } - public String stripns(String name, String namespace, boolean refp) { - // if namespace not null, removes it - // if refp add a # - return ((namespace != null) && (inNamespace(name, namespace))) - ? ((refp) ? HASH + strip(name) : strip(name)) - : name; - } public String strip(String name) { // remove namespace and # @@ -837,9 +753,6 @@ public static String nstrip(String name) { return name; } - public static String domain(String uri) { - return domain(uri, true); - } public static String domain(String uri, boolean scheme) { try { @@ -861,18 +774,6 @@ public static String domain(String uri, boolean scheme) { } } - public boolean sysNamespace(String name) { - for (String ns : def.keySet()) { - if (inNamespace(name, ns)) { - return true; - } - } - return false; - } - - public static boolean isPredefinedTransformation(String uri) { - return inNamespace(uri, STL); - } public static boolean isPredefinedNamespace(String uri) { return isResource(uri); @@ -903,14 +804,6 @@ public static boolean isFile(String path) { } } - public static boolean isURI(String str) { - for (String pro : protocol) { - if (str.startsWith(pro)) { - return true; - } - } - return false; - } /** * path = http://ns.inria.fr/corese/rule/owl.rul @@ -961,27 +854,6 @@ public static String namespace(String type) { return ""; } - /* - * return last occurrence of pat (e.g. '/') in str - * if pat is last, find preceding occurrence - */ - static int getIndex(String str, char pat) { - int index = str.lastIndexOf(pat); - if (index == str.length() - 1) { - logger.debug(str + " " + index + " " + str.lastIndexOf(pat, index)); - return str.lastIndexOf(pat, index - 1); - } else { - return index; - } - } - - public static String putNamespace(String ns, String label) { - return ns + label; - } - - public String getDefaultNamespaces() { - return defaultNamespaces; - } @Override public PointerType pointerType() { diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Optional.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Optional.java old mode 100755 new mode 100644 index 4a65a1692..292ba24ea --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Optional.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Optional.java @@ -56,9 +56,6 @@ public Optional(Exp e1, Exp e2) { add(e2); } - public static Optional create(Exp e1, Exp e2) { - return new Optional(e1, e2); - } public static Optional create(Exp exp) { return new Optional(exp); @@ -72,9 +69,6 @@ Bind validate(Bind env, int n) throws QuerySemanticException { return get(0).validate(env, n + 1); } - String getOper() { - return "option"; - } // corese option {} @Override diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ParserHandler.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ParserHandler.java index 3677c7cac..2c8ccc490 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ParserHandler.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ParserHandler.java @@ -428,9 +428,6 @@ public void leaveDelete() { insideDelete = false; } - public boolean isInsideDelete() { - return insideDelete; - } public void enterDeleteData() { insideDeleteData = true; @@ -440,9 +437,6 @@ public void leaveDeleteData() { insideDeleteData = false; } - public boolean isInsideDeleteData() { - return insideDeleteData; - } public boolean isInsideValues() { return insideValues; @@ -456,9 +450,6 @@ public ArrayList getErrorList() { return errorList; } - public void setErrorList(ArrayList errorList) { - this.errorList = errorList; - } boolean isTurtleLoader() { return turtleLoader; @@ -468,9 +459,6 @@ void setTurtleLoader(boolean b) { turtleLoader = b; } - boolean isSparqlParser() { - return !isTurtleLoader(); - } public Creator getCreate() { return create; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ParserSparql1.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ParserSparql1.java index 81a6d4af7..02e9cf2f1 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ParserSparql1.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ParserSparql1.java @@ -36,9 +36,6 @@ public static ParserSparql1 create(ASTQuery aq) { return new ParserSparql1(aq); } - public ASTQuery getAST() { - return ast; - } ParserSparql1(ASTQuery aq) { if (aq.getText() != null) { 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 old mode 100755 new mode 100644 index c90178691..9ee1c297b --- 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 @@ -478,13 +478,6 @@ static void init(){ term = t; } - Term getTerm() { - return term; - } - - public static Processor create(){ - return new Processor(); - } // filter(exist {PAT}) @@ -1112,9 +1105,6 @@ static void defoper(String key, int value){ define(key, value); } - static void defextoper(String key, int value) throws EngineException{ - defextoper(key, value, 2); - } static void defextoper(String key, int value, int arity) throws EngineException{ define(key, value); @@ -1147,9 +1137,6 @@ public static ASTQuery getAST(){ return ast; } - boolean fixed(String name){ - return fixed.containsKey(name); - } static int getOper(Term term){ @@ -1189,8 +1176,6 @@ else if (name.startsWith(NSManager.CAST)) { return n; } - public static void finish(){ - } void preprocess(Term term, ASTQuery ast){ @@ -1362,14 +1347,6 @@ void compileSQL(Term term, ASTQuery ast){ //sql = new SQLFun(); } - // @deprecated - public ResultSet sql(IDatatype uri, IDatatype login, IDatatype passwd, IDatatype query){ - return null; //return sql.sql(uri, login, passwd, query); - } - - public ResultSet sql(IDatatype uri, IDatatype driver, IDatatype login, IDatatype passwd, IDatatype query){ - return null; //return sql.sql(uri, driver, login, passwd, query); - } /** * xpath(?g, '/book/title') @@ -1380,9 +1357,6 @@ void compileXPath(Term term, ASTQuery ast){ xfun.init(ast.getNSM(), !true); } - public XPathFun getXPathFun(){ - return xfun; - } public IDatatype xpath(IDatatype doc, IDatatype exp){ try { @@ -1395,9 +1369,6 @@ public IDatatype xpath(IDatatype doc, IDatatype exp){ return null; } - public VariableResolver getResolver(){ - return xfun.getResolver(); - } public void setResolver(VariableResolver res){ xfun.set(res); @@ -1481,31 +1452,6 @@ void compileExternal() { } - /** - * Eval external method - */ - public Object eval(IDatatype[] args){ - if (! isCorrect()) { - return null; - } - try { - return getMethod().invoke(getProcessor(), args); - } - catch (IllegalArgumentException e) { - // TODO Auto-generated catch block - logger.error("Operation failure", e); - } catch (IllegalAccessException e) { - // TODO Auto-generated catch block - logger.error("Operation failure", e); - } catch (InvocationTargetException e) { - // TODO Auto-generated catch block - logger.error("Operation failure", e); - } - catch (NullPointerException ex){ - - } - return null; - } void compileCustom(Term term, ASTQuery ast){ name = term.getLabel().substring(CUSTOM.length()); diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/RDFList.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/RDFList.java index 092e98b19..a81f91552 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/RDFList.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/RDFList.java @@ -21,9 +21,6 @@ public class RDFList extends And { list = l; } - public static RDFList create() { - return new RDFList(); - } @Override public boolean isRDFList() { @@ -34,13 +31,6 @@ public Atom head() { return first; } - void setHead(Atom e) { - first = e; - } - - void setList(List l) { - list = l; - } public List getList() { return list; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Scope.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Scope.java old mode 100755 new mode 100644 index 02b0c51d7..8eefc3f04 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Scope.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Scope.java @@ -14,9 +14,5 @@ public static Scope create(Exp e){ return new Scope(e); } - @Override - public boolean isScope(){ - return true; - } } diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Score.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Score.java old mode 100755 new mode 100644 index dab4a5ee4..d430dddad --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Score.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Score.java @@ -39,29 +39,6 @@ public Score(String name, Exp exp) { score = name; } - public static Score create(Atom name, Exp exp){ - if (! (exp instanceof And)){ - exp = new And(exp); - } - Score s = new Score(name.getName(), exp); - s.id = name; - return s; - } - - public Atom getName(){ - return id; - } - - public boolean isScore(){ - return true; - } - - - Exp duplicate(){ - Score exp = new Score(); - exp.score = score; - return exp; - } // void setScore(Vector names){ // Vector vec = names; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Service.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Service.java index 71723ae38..7c211c9d6 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Service.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Service.java @@ -42,11 +42,6 @@ public static Service create(List list, Exp body, boolean b) { return s; } - public static Service create(Atom serv, List list, Exp body, boolean b) { - Service s = new Service(serv, body, b); - s.setServiceList(list); - return s; - } static Atom getDefaultService(List list) { if (list.isEmpty()) { @@ -64,9 +59,6 @@ public static Service create(List list, Exp body) { return create(list, body, false); } - public static Service newInstance(List list, Exp body) { - return create(getList(list), body, false); - } public boolean isUndefined() { return getServiceName().getLabel().equals(UNDEFINED_SERVER); diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Source.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Source.java old mode 100755 new mode 100644 index a233b43cf..1acab16b6 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Source.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Source.java @@ -75,9 +75,6 @@ public void setLeaf(boolean s) { leaf = s; } - boolean isState() { - return state; - } @Override public boolean isGraph() { @@ -89,9 +86,6 @@ public void setRec(boolean b) { isRec = b; } - public boolean isRec() { - return isRec; - } @Override public ASTBuffer toString(ASTBuffer sb) { diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/SourceExp.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/SourceExp.java index 3208b86cd..1f246ba63 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/SourceExp.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/SourceExp.java @@ -13,9 +13,6 @@ public class SourceExp extends And { SourceExp() { } - SourceExp(Exp exp) { - super(exp); - } SourceExp(Atom at, Exp exp) { super(exp); 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 old mode 100755 new mode 100644 index b778ca2f2..6bedd7365 --- 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 @@ -1388,10 +1388,6 @@ void setCount(boolean b) { isCount = b; } - @Override - public boolean isTerm(String oper) { - return name.equals(oper); - } @Override public boolean isFunction() { @@ -1527,9 +1523,6 @@ public void add(Expression exp) { args.add(exp); } - public void add(int i, Expression exp) { - args.add(i, exp); - } public void setArg(int i, Expression exp) { args.set(i, exp); @@ -1548,13 +1541,6 @@ public Expression getBasicArg(int n) { return args.get(n); } - public String getOper() { - return getName(); - } - - public void setOper(String str) { - setName(str); - } /** * use case: select fun(?x) as ?y rewrite occurrences of ?y as fun(?x) @@ -1684,15 +1670,6 @@ public List getExpList() { return lExp; } - @Override - public IDatatype[] getArguments(int n) { - if (arguments == null) { - arguments = new IDatatype[n]; - } else { - java.util.Arrays.fill(arguments, null); - } - return arguments; - } public void setExpList(List l) { lExp = l; @@ -1716,9 +1693,6 @@ public Exist getExist() { return exist; } - public Exist getExistPattern() { - return exist; - } public Exp getExistContent() { if (exist == null) { @@ -1770,11 +1744,6 @@ public Expression prepare(ASTQuery ast) throws EngineException { - void checkFeature(Feature feat, ASTQuery ast, String mess) throws EngineException { - if (reject(feat, ast)) { - throw new SafetyException(mess); - } - } boolean reject(Feature feat, ASTQuery ast) { return Access.reject(feat, ast.getLevel()); diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/TopExp.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/TopExp.java old mode 100755 new mode 100644 index 7385f89f9..74a24d599 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/TopExp.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/TopExp.java @@ -17,12 +17,6 @@ public boolean isGenerated() { return generated; } - /** - * @param generated the generated to set - */ - public void setGenerated(boolean generated) { - this.generated = generated; - } private boolean generated = false; @Override @@ -44,9 +38,6 @@ public String toSparql() { return toString(); } - public StringBuffer toJava(StringBuffer sb) { - return toString(sb); - } @Override public void accept(ASTVisitor visitor) { @@ -61,16 +52,6 @@ public List getInscopeVariables() { return getVariables(VariableScope.inscope); } - public List getAllVariables() { - return getVariables(VariableScope.allscope); - } - - // if statement: consider filter and statement inscope - // if filter: consider filter - // use case: when called on object of type Exp that contains a filter (Triple as Filter) - public List getFilterVariables() { - return getVariables(VariableScope.filterscope); - } /** * List of variables of statement Exp (bgp, optional, union, etc.) and/or filter Expression 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 old mode 100755 new mode 100644 index 9eb54ee78..dddcb8280 --- 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 @@ -87,9 +87,6 @@ public Triple() { setID(); } - public Triple(int num) { - id = num; - } // subject pred::var object Triple(Atom sub, Constant pred, Variable var, Atom obj) { @@ -109,12 +106,6 @@ public static Triple create(Atom src, Atom sub, Constant pred, Variable var, Ato return t; } - public static Triple create(Atom src, Atom sub, Constant pred, Atom obj) { - Triple t = new Triple(sub, pred, null, obj); - t.source = src; - t.setID(); - return t; - } public static Triple create(Atom sub, Constant pred, Variable var, Atom obj) { Triple t = new Triple(sub, pred, var, obj); @@ -122,9 +113,6 @@ public static Triple create(Atom sub, Constant pred, Variable var, Atom obj) { return t; } - public static Triple create(String subject, String property, String value) { - return create(null, subject, property, value); - } public static Triple create(String source, String subject, String property, String value) { @@ -217,9 +205,6 @@ synchronized static int nextID() { return ccid++; } - public void setID(int num) { - id = num; - } /** * ********************************************************************** @@ -227,42 +212,11 @@ public void setID(int num) { * path : p[2] p{2} return uri triple */ - /** - * Util functions - * - * @return - */ - public String getResource() { - return subject.getName(); - } - - public String getValue() { - return object.getName(); - } - - public String getSourceName() { - if (source == null) { - return null; - } - return source.getName(); - } public Atom getSource() { return source; } - public void setVSource(Atom at) { - source = at; - } - - @Override - public void setRec(boolean b) { - isRec = b; - } - - public boolean isRec() { - return isRec; - } public Atom getExp(int i) { switch (i) { @@ -297,23 +251,6 @@ public Atom getTerm(int i) { } } - public boolean similar(Triple t2) { - for (int i = 0; i < getArity(); i++) { - if (getArg(i) == null || t2.getArg(i) == null) { - if (getArg(i) != t2.getArg(i)) { - return false; - } - } - if (!getArg(i).getName().equals(t2.getArg(i).getName())) { - return false; - } - } - return true; - } - - public void setArg(int i, Atom exp) { - setExp(i, exp); - } public void setExp(int i, Atom exp) { switch (i) { @@ -368,14 +305,6 @@ public List getElements() { return list; } - public boolean hasTripleReference() { - for (Atom at : getArgList()) { - if (at.isTriple()) { - return true; - } - } - return false; - } public void setSubject(Atom e1) { subject = e1; @@ -401,40 +330,17 @@ public void setMode(String m) { mode = m; } - public int getStar() { - return star; - } - - public void setStar(int s) { - star = s; - } public boolean isType() { return istype; } - public void setType(boolean b) { - istype = b; - } public boolean isList() { return getProperty().getLabel().equals(RDF.FIRST) || getProperty().getLabel().equals(RDF.REST); } - public boolean isSameAs() { - return getProperty().getLabel().equals(OWL_SAME_AS); - } - - - /** - * - * @param str - * @return - */ - String clean(String str) { - return str; - } public String toNestedTriple() { return String.format("<<%s>>", toTriple()); @@ -557,31 +463,6 @@ ASTBuffer tuple(ASTBuffer sb, String s, String p, String o) { return sb; } - @Deprecated - public ASTBuffer toStringBasic(ASTBuffer sb) { - if (getSource() != null) { - sb.append(getSource()).append(SPACE); - } - - String s = getSubject().toString(); - String p = propertyToString(); - String o = getObject().toString(); - - if (getSubject().isTripleWithTriple() && getSubject().getTriple().isAsserted() - && displayAsTriple()) { - // this = t q v with t = s p o - // ::= - // s p o {| q v |} - sb.append(String.format("%s {| %s %s |} .", getSubject().toTriple(), p, o)); - } - else if (getArgs() == null || (hasReference() && displayAsTriple())) { - // std triple - sb.append(String.format("%s %s %s .", s, p, o)); - } else { - tuple(sb, s, p, o); - } - return sb; - } // Exp display() check triple.isDisplayable() @Override @@ -599,22 +480,6 @@ boolean isTopProperty() { || predicate.getName().equals(getRootPropertyQN()); } - public void setExp(boolean b) { - isexp = b; - } - - /** - * This triple will generate a relation in the graph not an exp, not an - * rdf:type with a constant value - */ - @Override - public boolean isRelation() { - if (istype) { - return (object.isVariable()); - } else { - return !isexp; - } - } // public boolean isExp() { // return isexp; @@ -640,12 +505,6 @@ Bind validate(Bind global, int n) { return env; } - /** - * Does triple bind this variable ? - */ - public boolean bind(Variable var) { - return bind(var.getName()); - } void getTripleVariables(VariableScope sort, List list) { getSubject().getVariables(sort, list); @@ -672,18 +531,6 @@ public boolean bind(String name) { return false; } - public Triple rewrite(Variable v1, Variable v2) { - if (getSubject().equals(v1)) { - setSubject(v2); - } - if (getObject().equals(v1)) { - setObject(v2); - } - if (getVariable() != null && getVariable().equals(v1)) { - setVariable(v2); - } - return this; - } public boolean bind(Expression e) { // @todo: use getFilterVariables() @@ -700,38 +547,17 @@ public boolean isOption() { return isoption; } - public int getID() { - return id; - } - - Triple lastTriple() { - return this; - } - - public void setTOption(boolean b) { - isoption = b; - } @Override public void setOption(boolean b) { isoption = b; } - public void setVariable(String var) { - variable = new Variable(var); - } public void setVariable(Variable var) { variable = var; } - public boolean isDirect() { - return isdirect; - } - - public boolean isOne() { - return false; - } public boolean isPath() { return variable != null && variable.isPath(); @@ -752,12 +578,6 @@ void setOne(boolean b) { //isone = b; } - public String getVariableName() { - if (variable == null) { - return null; - } - return variable.getName(); - } @Override public boolean equals(Object obj) { @@ -803,15 +623,6 @@ public Atom getPredicate() { } } - public void setPredicate(Atom at) { - if (at.isVariable()) { - setProperty(Constant.createResource(getRootPropertyQN())); - setVariable(at.getVariable()); - } else { - setVariable((Variable) null); - setProperty(at.getConstant()); - } - } public Variable getVariable() { return variable; @@ -917,9 +728,6 @@ public boolean validateDelete() { return !subject.isBlankNode() && !object.isBlankNode(); } - public boolean contains(Atom at) { - return subject.equals(at) || object.equals(at) || predicate.equals(at) || variable.equals(at); - } @Override void visit(ExpressionVisitor v) { 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..8e91d0748 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 @@ -53,11 +53,6 @@ public URLServer(String uri, String param) { init(param); } - // service clause - public URLServer(Node node) { - this(node.getLabel()); - setNode(node); - } @Override public String toString() { @@ -102,13 +97,6 @@ public String getParameter(String name) { return getMap().getFirst(name); } - public String getVariable(String name) { - String value = getParameter(name); - if (value != null && isVariable(value)) { - return extractVariable(value); - } - return null; - } String extractVariable(String value) { return value.substring(1, value.length()-1); @@ -352,18 +340,6 @@ public static void decode(Context c, String param) { - public void decode(Context c) { - if (hasParameter()) { - for (String key : getMap().keySet()) { - if (isEncoded(key)) { - if (isShare(key) && !c.hasValue(key)) { - c.add(EXPORT, key); - } - c.set(key, getParameterList(key)); - } - } - } - } static String clean(String name, String pref) { if (name.startsWith(pref)) { @@ -387,9 +363,6 @@ boolean isVariable(String value) { return value.startsWith("{") && value.endsWith("}"); } - public boolean hasMethod() { - return getParameter("method") != null; - } public boolean isGET() { String method = getParameter("method"); @@ -449,9 +422,6 @@ public String getURL() { return url; } - public String getLogURL() { - return getURL(); - } public String getLogURLNumber() { return String.format("%s.%s", getServer(), getNumber()); @@ -502,12 +472,6 @@ public void setDataset(Dataset dataset) { this.dataset = dataset; } - public String getURLParameter() { - if (getDataset()==null) { - return null; - } - return getDataset().getURLParameter(); - } public boolean isStorage() { return getServer().startsWith(STORE); diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Union.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Union.java old mode 100755 new mode 100644 index 033bd771e..8e2c58628 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Union.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Union.java @@ -76,9 +76,6 @@ void getVariables(VariableScope sort, List list) { } } - String getOper() { - return Keyword.SEOR; - } @Override public ASTBuffer toString(ASTBuffer sb) { diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Values.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Values.java index 99425e83c..c9f924082 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Values.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Values.java @@ -19,9 +19,6 @@ public class Values extends Exp { Binding bind; private boolean moved = false; - Values(List var, List> lval) { - - } Values() { lval = new ArrayList(); @@ -174,19 +171,11 @@ public void setVariables(List lvar) { this.lvar = lvar; } - public void setVariable(Variable var) { - ArrayList l = new ArrayList<>(); - l.add(var); - setVariables(l); - } public List getVarList() { return lvar; } - void setValues(List> lval) { - this.lval = lval; - } public void addValues(List l) { lval.add(l); @@ -231,9 +220,6 @@ public void setMoved(boolean moved) { } - public Expression getExp() { - return exp; - } public Expression getExpression() { return exp; 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 old mode 100755 new mode 100644 index 43ebe658f..0c6e8a020 --- 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 @@ -194,9 +194,6 @@ public Expression process(ASTQuery ast) { } } - public boolean isType(int type) { - return false; - } @Override public boolean isVariable() { @@ -315,23 +312,6 @@ public void setSubtype(int type) { setType(type); } - /** - * @return the var - */ - public Variable getVariableProxy() { - return proxy; - } - - public Variable getProxyOrSelf() { - return (proxy == null) ? this : proxy; - } - - /** - * @param var the var to set - */ - public void setVariableProxy(Variable var) { - this.proxy = var; - } @Override public Variable getDefinition() { diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/VariableScope.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/VariableScope.java index a90b29c3a..00327d3c1 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/VariableScope.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/VariableScope.java @@ -110,13 +110,6 @@ public boolean isExist() { return exist; } - /** - * @param exist the exist to set - */ - public VariableScope setExist(boolean exist) { - this.exist = exist; - return this; - } 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..2a1d2269c 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 @@ -61,21 +61,11 @@ void init() { setSubjectMap(new SubjectMap()); } - synchronized ContextLog getSynchonizedLog() { - return this; - } String getSubject() { return SUBJECT; } - public PropertyMap getPropertyMap() { - return getSubjectMap().getPropertyMap(getSubject()); - } - - public PropertyMap getPropertyMap(String subject) { - return getSubjectMap().getPropertyMap(subject); - } public IDatatype get(String subject, String property) { return getSubjectMap().get(subject, property); @@ -85,18 +75,6 @@ public IDatatype getLabel(String subject, String property) { return getSubjectMap().get(subject, getPredicate(property)); } - public List> getLabelList(String property) { - ArrayList> list = new ArrayList<>(); - - for (String url : keySet()) { - IDatatype dt = getLabel(url, property); - if (dt != null) { - list.add(List.of(url, property, dt.getLabel())); - } - } - - return list; - } public String getString(String subject, String property) { IDatatype dt = get(subject, property); @@ -106,21 +84,11 @@ public String getString(String subject, String property) { return dt.getLabel(); } - public List getStringList(String subject, String property) { - return getSubjectMap().getStringList(subject, property); - } public List getStringList(String property) { return getSubjectMap().getStringList(getSubject(), property); } - public String getStringElement(String property, int n) { - List list = getSubjectMap().getStringList(getSubject(), property); - if (n < list.size()) { - return list.get(n); - } - return null; - } public List getStringListDistinct(String property) { @@ -145,15 +113,6 @@ public Mappings getMappings(String property) { return getMappings(getSubject(), property); } - public String getMessage() { - for (int i = getLinkList().size()-1; i>=0; i--) { - String url = getLinkList().get(i); - if (url.contains(MES)) { - return url; - } - } - return null; - } public Mappings getMappings(String subject, String property) { IDatatype dt = getSubjectMap().get(subject, property); @@ -166,9 +125,6 @@ public Mappings getMappings(String subject, String property) { return null; } - public ASTQuery getAST(String property) { - return getAST(getSubject(), property); - } public ASTQuery getAST(String subject, String property) { IDatatype dt = getSubjectMap().get(subject, property); @@ -181,17 +137,11 @@ public ASTQuery getAST(String subject, String property) { return null; } - public String getString(String property) { - return getString(getSubject(), property); - } public void set(String property, String value) { getSubjectMap().set(getSubject(), property, value); } - public void set(String property, int value) { - getSubjectMap().set(getSubject(), property, value); - } public void incr(String subject, String property, int value) { getSubjectMap().incr(subject, property, value); @@ -208,9 +158,6 @@ public void set(String subject, String property, String value) { getSubjectMap().set(subject, property, value); } - public void setLabel(String subject, String property, String value) { - getSubjectMap().set(subject, getPredicate(property), value); - } public void defLabel(String subject, String property, String value) { getSubjectMap().set(subject, getPredicate(property), value); @@ -252,30 +199,11 @@ public void add(String property, String value) { getSubjectMap().add(getSubject(), property, value); } - public void add(String property, IDatatype value) { - getSubjectMap().add(getSubject(), property, value); - } - - public void addDistinct(String property, IDatatype value) { - addDistinct(getSubject(), property, value); - } - - // add value to list of value - public void add(String subject, String property, String value) { - getSubjectMap().add(subject, property, value); - } - - public void add(String subject, String property, IDatatype value) { - getSubjectMap().add(subject, property, value); - } public void addDistinct(String subject, String property, IDatatype value) { getSubjectMap().addDistinct(subject, property, value); } - public void add(String subject, String property, Object value) { - getSubjectMap().add(subject, property, value); - } @Override public String toString() { @@ -331,9 +259,6 @@ public void logToFile(String fileName) throws IOException { file.close(); } - public boolean isEmpty() { - return getSubjectMap().isEmpty(); - } public List getExceptionList() { return exceptionList; @@ -347,24 +272,11 @@ public void addException(EngineException e) { getExceptionList().add(e); } - public String getLink() { - if (getLinkList().isEmpty()) { - return null; - } - return getLinkList().get(0); - } public List getLinkList() { return linkList; } - public void setLink(List linkList) { - this.linkList = linkList; - } - - public void addLink(String url) { - getLinkList().add(url); - } public void addLink(List linkList) { getLinkList().addAll(linkList); @@ -461,21 +373,6 @@ String[] getShareable() { return shareable; } - /***************************** - * - * JSON message - * - *****************************/ - - - - /** - * Copy data from ContextLog into json message - * Copy endpoint exceptions - */ - public JSONObject message() { - return message(new JSONObject()); - } public JSONObject message(JSONObject json) { messageHeader(json); @@ -606,16 +503,6 @@ public void setTrace(StringBuilder trace) { this.trace = trace; } - public Mappings getLastInputMappings() { - String last = getLast(ENDPOINT_CALL); - if (last != null) { - IDatatype dt = get(last, LogKey.INPUT); - if (dt != null) { - return dt.getPointerObject().getMappings(); - } - } - return null; - } public String getLast(String name) { IDatatype list = get(name); @@ -629,9 +516,6 @@ public List getFormatList() { return formatList; } - public void setFormatList(List formatList) { - this.formatList = formatList; - } public ASTQuery getASTIndex() { return astIndex; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/LinkedResultLog.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/LinkedResultLog.java index b83468812..95ad58468 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/LinkedResultLog.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/LinkedResultLog.java @@ -12,39 +12,5 @@ */ public class LinkedResultLog extends JSONObject implements URLParam { - public void setLink(String key, String value) { - put(key, value); - } - - public void setLink(String key, JSONObject obj) { - put(key, obj); - } - - public void addLink(String name, JSONObject obj) { - JSONArray arr = null; - if (has(name)) { - arr = getJSONArray(name); - } - else { - arr = new JSONArray(); - put(name, arr); - } - arr.put(obj); - } - - public JSONObject create(String query) { - JSONObject obj = new JSONObject(); - obj.put(QUERY, query); - return obj; - } - - public JSONObject create(String query, String result) { - JSONObject obj = new JSONObject(); - obj.put(QUERY, query); - if (result != null) { - obj.put(RESULT, result); - } - return obj; - } } 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..e4c5f2e09 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 @@ -29,9 +29,6 @@ public List getKeys() { return sort(keySet()); } - public StringBuilder display() { - return display(new StringBuilder()); - } public StringBuilder display(StringBuilder sb) { int n = 0; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/SubjectMap.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/SubjectMap.java index 4575bb27e..fb26c16e6 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/SubjectMap.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/SubjectMap.java @@ -33,9 +33,6 @@ public List getKeys() { return sort(keySet()); } - public StringBuilder display() { - return display(new StringBuilder()); - } public StringBuilder display(StringBuilder sb) { for (String sub : getKeys()) { diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ASTParser.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ASTParser.java index d723d7a1b..26348ebdf 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ASTParser.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ASTParser.java @@ -392,9 +392,6 @@ public int getNbService() { return nbService; } - public void setNbService(int nbService) { - this.nbService = nbService; - } public boolean isBnode() { return bnode; @@ -424,9 +421,6 @@ public ASTQuery getAST() { return ast; } - public void setAST(ASTQuery ast) { - this.ast = ast; - } int last() { return getStack().size() - 1; @@ -453,8 +447,5 @@ public ArrayList getStack() { return stack; } - public void setStack(ArrayList stack) { - this.stack = stack; - } } 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..e62428a8b 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 @@ -395,12 +395,6 @@ public boolean isFunctionDefinition() { return functionDefinition; } - /** - * @param functionDefinition the functionDefinition to set - */ - public void setFunctionDefinition(boolean functionDefinition) { - this.functionDefinition = functionDefinition; - } /** * @return the nbVariable diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/Record.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/Record.java index a9986a54e..0e3422ad7 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/Record.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/Record.java @@ -35,12 +35,6 @@ public void setExpression(TopExp expression) { this.expression = expression; } - /** - * @return the uri - */ - public String getUri() { - return uri; - } /** * @param uri the uri to set diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/printer/SPIN.java b/src/main/java/fr/inria/corese/core/sparql/triple/printer/SPIN.java index 0ae2d5f05..0f3c48944 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/printer/SPIN.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/printer/SPIN.java @@ -90,9 +90,6 @@ public void nl() { sb.append(NL); } - public ASTBuffer getBuffer() { - return sb; - } public void setBuffer(ASTBuffer s) { sb = s; @@ -958,16 +955,6 @@ String getName(Variable var, HashMap tvar) { return bn; } - void process(Variable var) { - String name = var.getLabel(); - String bn = tvar.get(name); - if (bn == null) { - bn = blank(var); - tvar.put(name, bn); - } - - sb.append(bn); - } void displayVar() { for (String var : tvar.keySet()) { diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/update/ASTUpdate.java b/src/main/java/fr/inria/corese/core/sparql/triple/update/ASTUpdate.java index edb07f3a6..e692dba95 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/update/ASTUpdate.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/update/ASTUpdate.java @@ -142,9 +142,6 @@ public void defNamespace(String p, String ns) { prolog.defNamespace(p, ns); } - public void defService(String ns) { - - } public void defBase(String s) { prolog.defBase(s); diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/update/Basic.java b/src/main/java/fr/inria/corese/core/sparql/triple/update/Basic.java index 3a653656f..b26162cd4 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/update/Basic.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/update/Basic.java @@ -190,17 +190,11 @@ public boolean isSilent() { return silent; } - public void setGraph(String g) { - graph = g; - } public void setGraph(Constant g) { agraph = g; } - public void setTarget(String t) { - target = t; - } public void setTarget(Constant t) { atarget = t; @@ -210,9 +204,6 @@ public Constant getCTarget() { return atarget; } - public void setURI(String t) { - uri = t; - } public void setURI(Constant t) { auri = t; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/update/Composite.java b/src/main/java/fr/inria/corese/core/sparql/triple/update/Composite.java index 216e6bb8f..1507d9890 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/update/Composite.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/update/Composite.java @@ -137,13 +137,6 @@ public ASTBuffer toString(ASTBuffer sb) { return sb; } - public Exp getDelete() { - return getPattern(Update.Keyword.DELETE); - } - - public Exp getInsert() { - return getPattern(Update.Keyword.INSERT); - } Exp getPattern(Update.Keyword type) { for (Composite cc : getUpdates()) { diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/update/Update.java b/src/main/java/fr/inria/corese/core/sparql/triple/update/Update.java index 6a38f69cb..22eb3286a 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/update/Update.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/update/Update.java @@ -75,17 +75,6 @@ public ASTUpdate getASTUpdate() { return astu; } - public ASTQuery getASTQuery() { - return astu.getASTQuery(); - } - - public String expand(String name) { - if (name == null) { - return null; - } - String res = getNSM().toNamespaceB(name); - return res; - } public Constant getGraphName() { return null; From 5086b4d7468bfbe93b552375b31977d9775a9fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20C=C3=A9r=C3=A8s?= Date: Thu, 25 Jun 2026 15:48:27 +0200 Subject: [PATCH 2/2] Fix Context rebase integration after corese-next --- .../fr/inria/corese/core/sparql/triple/parser/Context.java | 4 ---- 1 file changed, 4 deletions(-) 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 05bc71cf5..48bd4ff4b 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 @@ -386,10 +386,6 @@ public Context setURI(String name, String str) { return this; } - public String getProfile() { - return stringValue(STL_PROFILE); - } - public String getURI() { return stringValue(STL_URI); }