From 257ee673e08d2d4080d156079ce7b62752f1476d Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Wed, 28 Sep 2022 07:13:11 -0700
Subject: Queued command model

---
 src/main/java/org/traccar/model/BaseCommand.java   | 40 +++++++++++++++++++
 src/main/java/org/traccar/model/Command.java       | 29 +-------------
 src/main/java/org/traccar/model/QueuedCommand.java | 45 ++++++++++++++++++++++
 3 files changed, 87 insertions(+), 27 deletions(-)
 create mode 100644 src/main/java/org/traccar/model/BaseCommand.java
 create mode 100644 src/main/java/org/traccar/model/QueuedCommand.java

(limited to 'src/main/java/org')

diff --git a/src/main/java/org/traccar/model/BaseCommand.java b/src/main/java/org/traccar/model/BaseCommand.java
new file mode 100644
index 000000000..16df9c126
--- /dev/null
+++ b/src/main/java/org/traccar/model/BaseCommand.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2022 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;
+
+public class BaseCommand extends Message {
+
+    private String description;
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    private boolean textChannel;
+
+    public boolean getTextChannel() {
+        return textChannel;
+    }
+
+    public void setTextChannel(boolean textChannel) {
+        this.textChannel = textChannel;
+    }
+
+}
diff --git a/src/main/java/org/traccar/model/Command.java b/src/main/java/org/traccar/model/Command.java
index 49486bdbc..4ea619e95 100644
--- a/src/main/java/org/traccar/model/Command.java
+++ b/src/main/java/org/traccar/model/Command.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2020 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2022 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.
@@ -22,7 +22,7 @@ import org.traccar.storage.StorageName;
 
 @StorageName("tc_commands")
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class Command extends Message implements Cloneable {
+public class Command extends BaseCommand {
 
     public static final String TYPE_CUSTOM = "custom";
     public static final String TYPE_IDENTIFICATION = "deviceIdentification";
@@ -84,21 +84,6 @@ public class Command extends Message implements Cloneable {
     public static final String KEY_SERVER = "server";
     public static final String KEY_PORT = "port";
 
-    @Override
-    public Command clone() throws CloneNotSupportedException {
-        return (Command) super.clone();
-    }
-
-    private boolean textChannel;
-
-    public boolean getTextChannel() {
-        return textChannel;
-    }
-
-    public void setTextChannel(boolean textChannel) {
-        this.textChannel = textChannel;
-    }
-
     @QueryIgnore
     @Override
     public long getDeviceId() {
@@ -111,14 +96,4 @@ public class Command extends Message implements Cloneable {
         super.setDeviceId(deviceId);
     }
 
-    private String description;
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
 }
diff --git a/src/main/java/org/traccar/model/QueuedCommand.java b/src/main/java/org/traccar/model/QueuedCommand.java
new file mode 100644
index 000000000..fff77a22b
--- /dev/null
+++ b/src/main/java/org/traccar/model/QueuedCommand.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2022 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 org.traccar.storage.StorageName;
+
+import java.util.HashMap;
+
+@StorageName("tc_commands_queue")
+public class QueuedCommand extends BaseCommand {
+
+    public static QueuedCommand fromCommand(Command command) {
+        QueuedCommand queuedCommand = new QueuedCommand();
+        queuedCommand.setDeviceId(command.getDeviceId());
+        queuedCommand.setType(command.getType());
+        queuedCommand.setDescription(command.getDescription());
+        queuedCommand.setTextChannel(command.getTextChannel());
+        queuedCommand.setAttributes(new HashMap<>(command.getAttributes()));
+        return queuedCommand;
+    }
+
+    public Command toCommand() {
+        Command command = new Command();
+        command.setDeviceId(getDeviceId());
+        command.setType(getType());
+        command.setDescription(getDescription());
+        command.setTextChannel(getTextChannel());
+        command.setAttributes(new HashMap<>(getAttributes()));
+        return command;
+    }
+
+}
-- 
cgit v1.2.3