aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/org/traccar/database/QueryBuilder.java10
-rw-r--r--src/main/java/org/traccar/model/MiscFormatter.java56
-rw-r--r--src/test/java/org/traccar/model/MiscFormatterTest.java20
3 files changed, 2 insertions, 84 deletions
diff --git a/src/main/java/org/traccar/database/QueryBuilder.java b/src/main/java/org/traccar/database/QueryBuilder.java
index 084d2940b..396cbf562 100644
--- a/src/main/java/org/traccar/database/QueryBuilder.java
+++ b/src/main/java/org/traccar/database/QueryBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2020 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.traccar.Context;
-import org.traccar.model.MiscFormatter;
import org.traccar.model.Permission;
import javax.sql.DataSource;
@@ -280,12 +279,7 @@ public final class QueryBuilder {
} else if (method.getReturnType().equals(byte[].class)) {
setBlob(name, (byte[]) method.invoke(object));
} else {
- if (method.getReturnType().equals(Map.class)
- && Context.getConfig().getBoolean("database.xml")) {
- setString(name, MiscFormatter.toXmlString((Map) method.invoke(object)));
- } else {
- setString(name, Context.getObjectMapper().writeValueAsString(method.invoke(object)));
- }
+ setString(name, Context.getObjectMapper().writeValueAsString(method.invoke(object)));
}
} catch (IllegalAccessException | InvocationTargetException | JsonProcessingException error) {
LOGGER.warn("Get property error", error);
diff --git a/src/main/java/org/traccar/model/MiscFormatter.java b/src/main/java/org/traccar/model/MiscFormatter.java
deleted file mode 100644
index c6511f063..000000000
--- a/src/main/java/org/traccar/model/MiscFormatter.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2013 - 2016 Anton Tananaev (anton@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.model;
-
-
-import java.text.DecimalFormat;
-import java.util.Map;
-
-public final class MiscFormatter {
-
- private MiscFormatter() {
- }
-
- private static final String XML_ROOT_NODE = "info";
-
- private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.##");
-
- private static String format(Object value) {
- if (value instanceof Double || value instanceof Float) {
- return DECIMAL_FORMAT.format(value);
- } else {
- return value.toString();
- }
- }
-
- public static String toXmlString(Map<String, Object> attributes) {
- StringBuilder result = new StringBuilder();
-
- result.append("<").append(XML_ROOT_NODE).append(">");
-
- for (Map.Entry<String, Object> entry : attributes.entrySet()) {
-
- result.append("<").append(entry.getKey()).append(">");
- result.append(format(entry.getValue()));
- result.append("</").append(entry.getKey()).append(">");
- }
-
- result.append("</").append(XML_ROOT_NODE).append(">");
-
- return result.toString();
- }
-
-}
diff --git a/src/test/java/org/traccar/model/MiscFormatterTest.java b/src/test/java/org/traccar/model/MiscFormatterTest.java
deleted file mode 100644
index eb93d5b38..000000000
--- a/src/test/java/org/traccar/model/MiscFormatterTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.traccar.model;
-
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
-
-public class MiscFormatterTest {
-
- @Test
- public void testToString() throws Exception {
-
- Position position = new Position();
- position.set("a", "1");
- position.set("b", "2");
- position.set("a", "3");
-
- assertEquals("<info><a>3</a><b>2</b></info>", MiscFormatter.toXmlString(position.getAttributes()));
-
- }
-
-}