From 8331091c5bba763fa714f8e8a6dbd8c58136429d Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 18 May 2017 15:56:48 +0500 Subject: - Optimize method enumeration - Optimize variable name construct --- src/org/traccar/processing/ComputedAttributesHandler.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/org/traccar/processing/ComputedAttributesHandler.java b/src/org/traccar/processing/ComputedAttributesHandler.java index b158431ef..8689c5a58 100644 --- a/src/org/traccar/processing/ComputedAttributesHandler.java +++ b/src/org/traccar/processing/ComputedAttributesHandler.java @@ -18,8 +18,11 @@ package org.traccar.processing; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.Arrays; import java.util.Collection; +import java.util.HashSet; import java.util.Map; +import java.util.Set; import org.apache.commons.jexl2.JexlEngine; import org.apache.commons.jexl2.JexlException; @@ -41,11 +44,11 @@ public class ComputedAttributesHandler extends BaseDataHandler { private MapContext prepareContext(Position position) { MapContext result = new MapContext(); - Method[] methods = position.getClass().getMethods(); + Set methods = new HashSet<>(Arrays.asList(position.getClass().getMethods())); + methods.removeAll(Arrays.asList(Object.class.getMethods())); for (Method method : methods) { - if (method.getName().startsWith("get") && method.getParameterTypes().length == 0 - && !method.getName().equals("getClass")) { - String name = method.getName().substring(3, 4).toLowerCase() + method.getName().substring(4); + if (method.getName().startsWith("get") && method.getParameterTypes().length == 0) { + String name = Character.toLowerCase(method.getName().charAt(3)) + method.getName().substring(4); try { if (!method.getReturnType().equals(Map.class)) { -- cgit v1.2.3