aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/traccar/handler
diff options
context:
space:
mode:
authormemesaregood1 <sifepe4679@yandex.ru>2023-02-21 23:14:35 +0300
committermemesaregood1 <sifepe4679@yandex.ru>2023-02-21 23:14:35 +0300
commita41ad7237035b27634cd6eac1a68e3cf1b553be9 (patch)
tree1dde4ade33f4eb13d98fd90238c1a09413625e7d /src/main/java/org/traccar/handler
parent7678392d85f43c60c93f2a08dcba6aa7ec6102e4 (diff)
downloadtrackermap-server-a41ad7237035b27634cd6eac1a68e3cf1b553be9.tar.gz
trackermap-server-a41ad7237035b27634cd6eac1a68e3cf1b553be9.tar.bz2
trackermap-server-a41ad7237035b27634cd6eac1a68e3cf1b553be9.zip
Shorten JEXL features palette
Diffstat (limited to 'src/main/java/org/traccar/handler')
-rw-r--r--src/main/java/org/traccar/handler/ComputedAttributesHandler.java25
1 files changed, 1 insertions, 24 deletions
diff --git a/src/main/java/org/traccar/handler/ComputedAttributesHandler.java b/src/main/java/org/traccar/handler/ComputedAttributesHandler.java
index c3f202fa2..912665630 100644
--- a/src/main/java/org/traccar/handler/ComputedAttributesHandler.java
+++ b/src/main/java/org/traccar/handler/ComputedAttributesHandler.java
@@ -57,39 +57,16 @@ public class ComputedAttributesHandler extends BaseDataHandler {
@Inject
public ComputedAttributesHandler(Config config, CacheManager cacheManager) {
this.cacheManager = cacheManager;
- boolean enableJEXLAnnotation = config.getBoolean(Keys.PROCESSING_COMPUTED_ATTRIBUTES_ANNOTATION);
- boolean enableJEXLArrayReferences = config.getBoolean(Keys.PROCESSING_COMPUTED_ATTRIBUTES_ARRAY_REFERENCES);
- boolean enableJEXLLambdas = config.getBoolean(Keys.PROCESSING_COMPUTED_ATTRIBUTES_LAMBDA);
- boolean enableJEXLLexical = config.getBoolean(Keys.PROCESSING_COMPUTED_ATTRIBUTES_LEXICAL);
- boolean enableJEXLLexicalShade = config.getBoolean(Keys.PROCESSING_COMPUTED_ATTRIBUTES_LEXICAL_SHADE);
boolean enableJEXLLocalVariables = config.getBoolean(Keys.PROCESSING_COMPUTED_ATTRIBUTES_LOCAL_VARIABLES);
boolean enableJEXLLoops = config.getBoolean(Keys.PROCESSING_COMPUTED_ATTRIBUTES_LOOPS);
- boolean enableJEXLMethodCalls = config.getBoolean(Keys.PROCESSING_COMPUTED_ATTRIBUTES_METHOD_CALLS);
boolean enableJEXLNewInstanceCreation = config.getBoolean(Keys.PROCESSING_COMPUTED_ATTRIBUTES_NEW_INSTANCE_CREATION);
- boolean enableJEXLPragma = config.getBoolean(Keys.PROCESSING_COMPUTED_ATTRIBUTES_PRAGMA);
- boolean enableJEXLScriptConstructs = config.getBoolean(Keys.PROCESSING_COMPUTED_ATTRIBUTES_SCRIPT_CONSTRUCTS);
- boolean enableJEXLSideEffect = config.getBoolean(Keys.PROCESSING_COMPUTED_ATTRIBUTES_SIDE_EFFECT);
- boolean enableJEXLSideEffectGlobal = config.getBoolean(Keys.PROCESSING_COMPUTED_ATTRIBUTES_SIDE_EFFECT_GLOBAL);
- boolean enableJEXLStructuredLiteral = config.getBoolean(Keys.PROCESSING_COMPUTED_ATTRIBUTES_STRUCTURED_LITERAL);
JexlSandbox sandbox = new JexlSandbox(false);
sandbox.allow("com.safe.Functions");
- boolean enableJEXLRegister = true;
JexlFeatures features = new JexlFeatures()
- .annotation(enableJEXLAnnotation)
- .arrayReferenceExpr(enableJEXLArrayReferences)
- .lambda(enableJEXLLambdas)
- .lexical(enableJEXLLexical)
- .lexicalShade(enableJEXLLexicalShade)
.localVar(enableJEXLLocalVariables)
.loops(enableJEXLLoops)
- .methodCall(enableJEXLMethodCalls)
.newInstance(enableJEXLNewInstanceCreation)
- .pragma(enableJEXLPragma)
- .register(enableJEXLRegister)
- .script(enableJEXLScriptConstructs)
- .sideEffect(enableJEXLSideEffect)
- .sideEffectGlobal(enableJEXLSideEffectGlobal)
- .structuredLiteral(enableJEXLStructuredLiteral);
+ .structuredLiteral(true);
engine = new JexlBuilder()
.strict(true)
.namespaces(Collections.singletonMap("math", Math.class))