3 files changed, 9 insertions, 90 deletions

diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index f01280836..978f08ef3 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -31,7 +31,6 @@ import java.util.Map;
 import javax.naming.InitialContext;
 import javax.sql.DataSource;
 import org.traccar.Config;
-import org.traccar.helper.Clazz;
 import org.traccar.helper.DriverDelegate;
 import org.traccar.helper.Log;
 import org.traccar.model.Device;
diff --git a/src/org/traccar/helper/Clazz.java b/src/org/traccar/helper/Clazz.java
deleted file mode 100644
index 1a1b445d5..000000000
--- a/src/org/traccar/helper/Clazz.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
- *
- * 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.helper;
-
-import java.beans.Introspector;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-
-public final class Clazz implements Serializable {
-
-    public static Class getGenericArgumentType(Class currentClass) {
-        return getGenericArgumentType(currentClass, null, 0);
-    }
-
-    public static Class getGenericArgumentType(Class currentClass, Class genericSuperClass, int argumentIndex) {
-        Type superType = currentClass.getGenericSuperclass();
-        if (superType == null) {
-            throw new IllegalArgumentException();
-        }
-        if (!(superType instanceof ParameterizedType)
-                || genericSuperClass != null
-                && ((ParameterizedType) superType).getRawType() != genericSuperClass) {
-            return getGenericArgumentType(currentClass.getSuperclass(), genericSuperClass, argumentIndex);
-        }
-        Object[] args = ((ParameterizedType) superType).getActualTypeArguments();
-        if (argumentIndex >= args.length) {
-            throw new IllegalArgumentException();
-        }
-        return cast(Class.class, args[argumentIndex]);
-    }
-
-    public static <T> T newInstance(Class<T> clazz) {
-        try {
-            return clazz.newInstance();
-        } catch (InstantiationException | IllegalAccessException e) {
-            throw new IllegalArgumentException();
-        }
-    }
-
-    public static <T> T cast(Class<T> classe, Object objeto) {
-        if (classe.isAssignableFrom(objeto.getClass())) {
-            return classe.cast(objeto);
-        }
-        throw new ClassCastException();
-    }
-
-    public static <T> long getId(T entity) throws Exception {
-        Method[] methods = entity.getClass().getMethods();
-        for (final Method method : methods) {
-            if (method.getName().startsWith("get") && method.getParameterTypes().length == 0) {
-                final String name = Introspector.decapitalize(method.getName().substring(3));
-                if (name.equals("id")) {
-                    return Long.parseLong(method.invoke(entity).toString());
-                }
-            }
-        }
-        throw new IllegalArgumentException();
-    }
-
-    public static <T, I> void setId(T entity, I id) throws Exception {
-        Method[] methods = entity.getClass().getMethods();
-        for (final Method method : methods) {
-            if (method.getName().startsWith("set") && method.getParameterTypes().length == 1) {
-                final String name = Introspector.decapitalize(method.getName().substring(3));
-                if (name.equals("id")) {
-                    method.invoke(entity, id);
-                    break;
-                }
-            }
-        }
-    }
-}
diff --git a/src/org/traccar/web/JsonConverter.java b/src/org/traccar/web/JsonConverter.java
index 38721db61..2ef61fb13 100644
--- a/src/org/traccar/web/JsonConverter.java
+++ b/src/org/traccar/web/JsonConverter.java
@@ -34,7 +34,6 @@ import javax.json.JsonValue;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
-import org.traccar.helper.Clazz;
 import org.traccar.helper.Log;
 import org.traccar.model.Factory;
 import org.traccar.model.MiscFormatter;
@@ -44,6 +43,14 @@ public final class JsonConverter {
     private JsonConverter() {
     }
 
+    private static <T> T newClassInstance(Class<T> clazz) {
+        try {
+            return clazz.newInstance();
+        } catch (InstantiationException | IllegalAccessException e) {
+            throw new IllegalArgumentException();
+        }
+    }
+
     private static final DateTimeFormatter DATE_FORMAT = ISODateTimeFormat.dateTime();
 
     public static Date parseDate(String value) {
@@ -69,7 +76,7 @@ public final class JsonConverter {
     }
 
     public static <T> T objectFromJson(JsonObject json, Class<T> clazz) {
-        T object = Clazz.newInstance(clazz);
+        T object = newClassInstance(clazz);
         Method[] methods = object.getClass().getMethods();
         return objectFromJson(json, object, methods);
     }