Merge pull request #1244 from tananaev/revert-1243-master

Revert removing double quotes

5 files changed, 3 insertions, 122 deletions

diff --git a/debug.xml b/debug.xml
index b54b2e7de..8762825ea 100644
--- a/debug.xml
+++ b/debug.xml
@@ -24,8 +24,6 @@
     <entry key='filter.zero'>true</entry>
     <entry key='filter.duplicate'>true</entry>
     <entry key='filter.distance'>50</entry>-->
-    
-    <entry key='alert.enable'>true</entry>
 
     <entry key='logger.enable'>true</entry>
     <entry key='logger.level'>all</entry>
@@ -164,7 +162,7 @@
     </entry>
 
     <entry key='database.getPermissions'>
-        SELECT userId, deviceId FROM user_device;
+        "SELECT userId, deviceId FROM user_device;"
     </entry>
     
     <entry key='database.selectDeviceAll'>
@@ -204,13 +202,6 @@
         UPDATE device SET positionId = :id WHERE id = :deviceId;
     </entry>
 
-    <entry key='database.getAlertsByDevice'>
-        SELECT a.id, a.idTipo, av.idVehicle, a.idGeofence, a.emails, a.velMax, a.tiempoMinpar, a.nombre, a.odometro, av.odometro_inicial  
-        FROM alerta a 
-        INNER JOIN alerta_vehiculo av ON a.id = av.idAlerta 
-        INNER JOIN vehicle v ON av.idVehicle = v.id      
-        WHERE v.idDevice = :deviceId;
-    </entry>
 
     <!-- PROTOCOL CONFIG -->
 
diff --git a/src/org/traccar/AlertHandler.java b/src/org/traccar/AlertHandler.java
deleted file mode 100644
index bfbcdcd1f..000000000
--- a/src/org/traccar/AlertHandler.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2015 alexis.
- *
- * 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;
-
-import java.util.Collection;
-import java.util.List;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.oneone.OneToOneDecoder; 
-import org.traccar.model.Alert;
-import org.traccar.model.Device;
-import org.traccar.model.Event;
-import org.traccar.model.Position;
-
-/**
- *
- * @author alexis
- */
-public class AlertHandler extends OneToOneDecoder {
-
-    public AlertHandler() {
-
-    }
-
-    private void checkAlerts(Position p, Device d) throws Exception {
-        Long idDevice = p.getDeviceId();
-        Collection<Alert> alerts = Context.getDataManager().getAlertsByDevice(idDevice);
-        if (alerts != null && !alerts.isEmpty()) {
-            //int speed = (int) (p.getSpeed() * 1.852);
-            for (Alert alerta : alerts) {
-                
-            }
-        }
-    }
-
-    @Override
-    protected Object decode(
-            ChannelHandlerContext ctx, Channel channel, Object msg)
-            throws Exception {
-
-        if (msg instanceof Position) {
-            Position position = (Position) msg;
-
-        } else if (msg instanceof List) {
-            List<Position> positions = (List<Position>) msg;
-            for (Position position : positions) {
-
-            }
-        }
-        
-        return msg;
-    }
-}
diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index 1f18ce48e..fcb6266ef 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -32,7 +32,6 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
 
     private final TrackerServer server;
     private FilterHandler filterHandler;
-    private AlertHandler alertHandler;
     private Integer resetDelay;
     private Boolean processInvalidPositions;
 
@@ -94,11 +93,6 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
         if (enableFilter != null && Boolean.valueOf(enableFilter)) {
             filterHandler = new FilterHandler();
         }
-        
-        String enableAlerts = Context.getProps().getProperty("alert.enable");
-        if(enableAlerts != null && Boolean.valueOf(enableAlerts)){
-            alertHandler = new AlertHandler();
-        }
 
         if (Context.getReverseGeocoder() != null) {
             // Default behavior is to process invalid positions (i.e., the "null" case)
@@ -123,9 +117,6 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
         if (filterHandler != null) {
             pipeline.addLast("filter", filterHandler);
         }
-        if (alertHandler != null) {
-            pipeline.addLast("alert", alertHandler);
-        }
         if (Context.getReverseGeocoder() != null) {
             pipeline.addLast("geocoder", new ReverseGeocoderHandler(Context.getReverseGeocoder(), processInvalidPositions));
         }
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 35e9cff95..9633ada58 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -46,7 +46,6 @@ import org.traccar.model.Permission;
 import org.traccar.model.Position;
 import org.traccar.model.Server;
 import org.traccar.model.User;
-import org.traccar.model.Alert;
 
 import com.mchange.v2.c3p0.ComboPooledDataSource;
 
@@ -323,10 +322,5 @@ public class DataManager {
                 .setObject(server)
                 .executeUpdate();
     }
-    
-    public Collection<Alert> getAlertsByDevice(Long deviceId) throws SQLException {
-        return QueryBuilder.create(dataSource, properties.getProperty("database.getAlertsByDevice"))
-                .setLong("deviceId", deviceId)
-                .executeQuery(new Alert());
-    }
-}
\ No newline at end of file
+
+}
diff --git a/src/org/traccar/model/Alert.java b/src/org/traccar/model/Alert.java
deleted file mode 100644
index 81964eaea..000000000
--- a/src/org/traccar/model/Alert.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2015 alexis.
- *
- * 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;
-
-/**
- *
- * @author alexis
- */
-public class Alert implements Factory {
-    
-    @Override
-    public Alert create() {
-        return new Alert();
-    }    
-    
-}