Initial implementation of new api with jax-rs.

Revert servlets to old api and remove plurals.
Fix findbugs for header origin.

2 files changed, 6 insertions, 52 deletions

diff --git a/src/org/traccar/helper/Authorization.java b/src/org/traccar/helper/Authorization.java
deleted file mode 100644
index d0877630d..000000000
--- a/src/org/traccar/helper/Authorization.java
+++ /dev/null
@@ -1,49 +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.util.HashMap;
-import java.util.Map;
-import java.util.StringTokenizer;
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.handler.codec.base64.Base64;
-import org.jboss.netty.util.CharsetUtil;
-
-public final class Authorization {
-
-    private Authorization() {
-    }
-
-    public static final String AUTHORIAZTION_SCHEME_VALUE = "Basic";
-    public static final String REGEX = AUTHORIAZTION_SCHEME_VALUE + " ";
-    public static final String REPLACEMENT = "";
-    public static final String TOKENIZER = ":";
-    public static final String USERNAME = "username";
-    public static final String PASSWORD = "password";
-    public static final String WWW_AUTHENTICATE_VALUE = "Basic realm=\"api\"";
-
-    public static Map<String, String> parse(String authorization) {
-        Map<String, String> authMap = new HashMap<>();
-        final String encodedUsernameAndPassword = authorization.replaceFirst(REGEX, REPLACEMENT);
-        ChannelBuffer buffer = ChannelBuffers.copiedBuffer(encodedUsernameAndPassword, CharsetUtil.UTF_8);
-        String usernameAndPassword = Base64.decode(buffer).toString(CharsetUtil.UTF_8);
-        final StringTokenizer tokenizer = new StringTokenizer(usernameAndPassword, TOKENIZER);
-        authMap.put(USERNAME, tokenizer.nextToken());
-        authMap.put(PASSWORD, tokenizer.nextToken());
-        return authMap;
-    }
-}
diff --git a/src/org/traccar/helper/Clazz.java b/src/org/traccar/helper/Clazz.java
index bdde940a0..ba4c4fded 100644
--- a/src/org/traccar/helper/Clazz.java
+++ b/src/org/traccar/helper/Clazz.java
@@ -16,11 +16,14 @@
 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 {
+public final class Clazz implements Serializable {
+
+    private static final long serialVersionUID = 4983299355055144885L;
 
     private Clazz() {
     }
@@ -77,7 +80,7 @@ public final class Clazz {
         }
     }
 
-    public static long getId(Object entity) throws Exception {
+    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) {
@@ -90,7 +93,7 @@ public final class Clazz {
         throw new IllegalArgumentException();
     }
 
-    public static void setId(Object entity, long id) throws Exception {
+    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) {