diff options
| author | kamaci <furkankamaci@gmail.com> | 2020-10-19 00:30:01 +0300 |
|---|---|---|
| committer | kamaci <furkankamaci@gmail.com> | 2020-10-19 00:30:01 +0300 |
| commit | 3ad889413e4b13d2dd6a2aa6454964dd9427fb28 (patch) | |
| tree | 9c5be8d286ef0f2244329d60385e9e8f1fef6fbd /src/main/java/org/traccar | |
| parent | 3cd7831692b1725713e297372a0181e5ae614eb9 (diff) | |
| download | traccar-server-3ad889413e4b13d2dd6a2aa6454964dd9427fb28.tar.gz traccar-server-3ad889413e4b13d2dd6a2aa6454964dd9427fb28.tar.bz2 traccar-server-3ad889413e4b13d2dd6a2aa6454964dd9427fb28.zip | |
Import arrangements are rollbacked.
Diffstat (limited to 'src/main/java/org/traccar')
| -rw-r--r-- | src/main/java/org/traccar/sms/smpp/SmppClient.java | 23 | ||||
| -rw-r--r-- | src/main/java/org/traccar/web/CsvBuilder.java | 12 |
2 files changed, 18 insertions, 17 deletions
diff --git a/src/main/java/org/traccar/sms/smpp/SmppClient.java b/src/main/java/org/traccar/sms/smpp/SmppClient.java index 5e157d0de..6eb850b6a 100644 --- a/src/main/java/org/traccar/sms/smpp/SmppClient.java +++ b/src/main/java/org/traccar/sms/smpp/SmppClient.java @@ -16,6 +16,18 @@ */ package org.traccar.sms.smpp; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.traccar.Context; +import org.traccar.notification.MessageException; +import org.traccar.sms.SmsManager; + import com.cloudhopper.commons.charset.CharsetUtil; import com.cloudhopper.smpp.SmppBindType; import com.cloudhopper.smpp.SmppConstants; @@ -31,17 +43,6 @@ import com.cloudhopper.smpp.type.RecoverablePduException; import com.cloudhopper.smpp.type.SmppChannelException; import com.cloudhopper.smpp.type.SmppTimeoutException; import com.cloudhopper.smpp.type.UnrecoverablePduException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.traccar.Context; -import org.traccar.notification.MessageException; -import org.traccar.sms.SmsManager; - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; public class SmppClient implements SmsManager { diff --git a/src/main/java/org/traccar/web/CsvBuilder.java b/src/main/java/org/traccar/web/CsvBuilder.java index 2efe2adde..b962be072 100644 --- a/src/main/java/org/traccar/web/CsvBuilder.java +++ b/src/main/java/org/traccar/web/CsvBuilder.java @@ -16,12 +16,6 @@ */ package org.traccar.web; -import com.fasterxml.jackson.core.JsonProcessingException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.traccar.Context; -import org.traccar.helper.DateUtil; - import java.beans.Introspector; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -32,6 +26,12 @@ import java.util.Map; import java.util.SortedSet; import java.util.TreeSet; +import com.fasterxml.jackson.core.JsonProcessingException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.traccar.Context; +import org.traccar.helper.DateUtil; + public class CsvBuilder { private static final Logger LOGGER = LoggerFactory.getLogger(CsvBuilder.class); |