Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Added protocol datapoint service (#765)

Rich Turner01c468632f48
diff --git a/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java
index cacc7fb69..9665b5254 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java
@@ -37,7 +37,6 @@ import org.openremote.model.attribute.AttributeState;
import org.openremote.model.protocol.ProtocolUtil;
import org.openremote.model.syslog.SyslogCategory;
import org.openremote.model.util.Pair;
-import org.openremote.model.value.MetaItemType;
import java.util.HashMap;
import java.util.HashSet;
@@ -82,7 +81,8 @@ public abstract class AbstractProtocol<T extends Agent<T, ?, U>, U extends Agent
protected TimerService timerService;
protected ScheduledExecutorService executorService;
protected ProtocolAssetService assetService;
- protected ProtocolPredictedAssetService predictedAssetService;
+ protected ProtocolPredictedDatapointService predictedDatapointService;
+ protected ProtocolDatapointService datapointService;
protected T agent;
public AbstractProtocol(T agent) {
@@ -94,7 +94,8 @@ public abstract class AbstractProtocol<T extends Agent<T, ?, U>, U extends Agent
timerService = container.getService(TimerService.class);
executorService = container.getExecutorService();
assetService = container.getService(ProtocolAssetService.class);
- predictedAssetService = container.getService(ProtocolPredictedAssetService.class);
+ predictedDatapointService = container.getService(ProtocolPredictedDatapointService.class);
+ datapointService = container.getService(ProtocolDatapointService.class);
messageBrokerContext = container.getService(MessageBrokerService.class).getContext();
withLock(getProtocolName() + "::start", () -> {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/ProtocolDatapointService.java b/agent/src/main/java/org/openremote/agent/protocol/ProtocolDatapointService.java
new file mode 100644
index 000000000..978279f47
--- /dev/null
+++ b/agent/src/main/java/org/openremote/agent/protocol/ProtocolDatapointService.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2017, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.agent.protocol;
+
+import org.openremote.model.ContainerService;
+import org.openremote.model.util.Pair;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+public interface ProtocolDatapointService extends ContainerService {
+
+ void upsertValue(String assetId, String attributeName, Object value, LocalDateTime timestamp) throws IllegalStateException;
+
+ void upsertValues(String assetId, String attributeName, List<Pair<?, LocalDateTime>> valuesAndTimestamps) throws IllegalStateException;
+}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/ProtocolPredictedAssetService.java b/agent/src/main/java/org/openremote/agent/protocol/ProtocolPredictedDatapointService.java
similarity index 93%
rename from agent/src/main/java/org/openremote/agent/protocol/ProtocolPredictedAssetService.java
rename to agent/src/main/java/org/openremote/agent/protocol/ProtocolPredictedDatapointService.java
index 3aabc92a9..cd62a785b 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/ProtocolPredictedAssetService.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/ProtocolPredictedDatapointService.java
@@ -24,7 +24,7 @@ import org.openremote.model.attribute.AttributeRef;
import java.time.LocalDateTime;
-public interface ProtocolPredictedAssetService extends ContainerService {
+public interface ProtocolPredictedDatapointService extends ContainerService {
void updateValue(AttributeRef attributeRef, Object value, LocalDateTime timestamp);
diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java
index 7b0f792a0..df3895996 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java
@@ -1,5 +1,6 @@
package org.openremote.manager.datapoint;
+import org.openremote.agent.protocol.ProtocolDatapointService;
import org.openremote.container.timer.TimerService;
import org.openremote.container.util.UniqueIdentifierGenerator;
import org.openremote.manager.asset.AssetProcessingException;
@@ -51,7 +52,7 @@ import static org.openremote.model.value.MetaItemType.STORE_DATA_POINTS;
* and {@link #OR_DATA_POINTS_MAX_AGE_DAYS} setting; storage duration defaults to {@value #OR_DATA_POINTS_MAX_AGE_DAYS_DEFAULT}
* days.
*/
-public class AssetDatapointService extends AbstractDatapointService<AssetDatapoint> implements AssetUpdateProcessor {
+public class AssetDatapointService extends AbstractDatapointService<AssetDatapoint> implements AssetUpdateProcessor, ProtocolDatapointService {
public static final String OR_DATA_POINTS_MAX_AGE_DAYS = "OR_DATA_POINTS_MAX_AGE_DAYS";
public static final int OR_DATA_POINTS_MAX_AGE_DAYS_DEFAULT = 31;
diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointService.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointService.java
index 7414b01b6..8e9ed5f3a 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointService.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointService.java
@@ -19,7 +19,7 @@
*/
package org.openremote.manager.datapoint;
-import org.openremote.agent.protocol.ProtocolPredictedAssetService;
+import org.openremote.agent.protocol.ProtocolPredictedDatapointService;
import org.openremote.container.timer.TimerService;
import org.openremote.manager.asset.AssetStorageService;
import org.openremote.manager.security.ManagerIdentityService;
@@ -40,7 +40,7 @@ import java.util.logging.Logger;
import static java.time.temporal.ChronoUnit.HOURS;
-public class AssetPredictedDatapointService extends AbstractDatapointService<AssetPredictedDatapoint> implements ProtocolPredictedAssetService {
+public class AssetPredictedDatapointService extends AbstractDatapointService<AssetPredictedDatapoint> implements ProtocolPredictedDatapointService {
private static final Logger LOG = Logger.getLogger(AssetPredictedDatapointService.class.getName());