100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Cleanup asset hydration constructors
Rich Turner40c27720b520
diff --git a/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetAgent.java b/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetAgent.javaindex 96ce4c716..aec8fae03 100644--- a/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetAgent.java@@ -35,7 +35,7 @@ public class ArtnetAgent extends IoAgent<ArtnetAgent, ArtnetProtocol, AgentLink./*** For use by hydrators (i.e. JPA/Jackson)*/- ArtnetAgent() {+ protected ArtnetAgent() {}public ArtnetAgent(String name) {diff --git a/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetLightAsset.java b/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetLightAsset.javaindex b812d1e14..9feb42438 100644--- a/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetLightAsset.java+++ b/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetLightAsset.java@@ -31,8 +31,7 @@ public class ArtnetLightAsset extends LightAsset {/*** For use by hydrators (i.e. JPA/Jackson)*/- ArtnetLightAsset() {- this(null);+ protected ArtnetLightAsset() {}protected ArtnetLightAsset(String name) {diff --git a/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerAgent.java b/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerAgent.javaindex 649f20415..ea99280eb 100644--- a/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerAgent.java@@ -104,8 +104,7 @@ public class ControllerAgent extends Agent<ControllerAgent, ControllerProtocol,/*** For use by hydrators (i.e. JPA/Jackson)*/- ControllerAgent() {- this(null);+ protected ControllerAgent() {}public ControllerAgent(String name) {diff --git a/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventAgent.java b/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventAgent.javaindex 216e99cea..c94e535ea 100644--- a/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventAgent.java@@ -45,8 +45,7 @@ public class ClientEventAgent extends Agent<ClientEventAgent, ClientEventProtoco/*** For use by hydrators (i.e. JPA/Jackson)*/- ClientEventAgent() {- this(null);+ protected ClientEventAgent() {}diff --git a/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientAgent.java b/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientAgent.javaindex a2ba44203..2bdc8ebb3 100644--- a/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientAgent.java@@ -140,11 +140,9 @@ public class HttpClientAgent extends Agent<HttpClientAgent, HttpClientProtocol,/*** For use by hydrators (i.e. JPA/Jackson)*/- HttpClientAgent() {- this(null);+ protected HttpClientAgent() {}-public HttpClientAgent(String name) {super(name);}diff --git a/agent/src/main/java/org/openremote/agent/protocol/knx/KNXAgent.java b/agent/src/main/java/org/openremote/agent/protocol/knx/KNXAgent.javaindex f49238bdb..cc12dcbd6 100644--- a/agent/src/main/java/org/openremote/agent/protocol/knx/KNXAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/knx/KNXAgent.java@@ -98,8 +98,7 @@ public class KNXAgent extends Agent<KNXAgent, KNXProtocol, KNXAgent.KNXAgentLink/*** For use by hydrators (i.e. JPA/Jackson)*/- KNXAgent() {- this(null);+ protected KNXAgent() {}public KNXAgent(String name) {diff --git a/agent/src/main/java/org/openremote/agent/protocol/macro/MacroAgent.java b/agent/src/main/java/org/openremote/agent/protocol/macro/MacroAgent.javaindex 07b4da389..77e9eccd8 100644--- a/agent/src/main/java/org/openremote/agent/protocol/macro/MacroAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/macro/MacroAgent.java@@ -71,8 +71,7 @@ public class MacroAgent extends Agent<MacroAgent, MacroProtocol, MacroAgent.Macr/*** For use by hydrators (i.e. JPA/Jackson)*/- MacroAgent() {- this(null);+ protected MacroAgent() {}public MacroAgent(String name) {diff --git a/agent/src/main/java/org/openremote/agent/protocol/serial/SerialAgent.java b/agent/src/main/java/org/openremote/agent/protocol/serial/SerialAgent.javaindex db2c81f0b..6c093298b 100644--- a/agent/src/main/java/org/openremote/agent/protocol/serial/SerialAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/serial/SerialAgent.java@@ -35,7 +35,7 @@ public class SerialAgent extends IoAgent<SerialAgent, SerialClientProtocol, Agen/*** For use by hydrators (i.e. JPA/Jackson)*/- SerialAgent() {+ protected SerialAgent() {}public SerialAgent(String name) {diff --git a/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorAgent.java b/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorAgent.javaindex a8696894c..87c29f2fa 100644--- a/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorAgent.java@@ -61,8 +61,7 @@ public class SimulatorAgent extends Agent<SimulatorAgent, SimulatorProtocol, Sim/*** For use by hydrators (i.e. JPA/Jackson)*/- SimulatorAgent() {- this(null);+ protected SimulatorAgent() {}public SimulatorAgent(String name) {diff --git a/agent/src/main/java/org/openremote/agent/protocol/tcp/TcpClientAgent.java b/agent/src/main/java/org/openremote/agent/protocol/tcp/TcpClientAgent.javaindex fc343c67e..3a35cacbc 100644--- a/agent/src/main/java/org/openremote/agent/protocol/tcp/TcpClientAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/tcp/TcpClientAgent.java@@ -35,7 +35,7 @@ public class TcpClientAgent extends IoAgent<TcpClientAgent, TcpClientProtocol, A/*** For use by hydrators (i.e. JPA/Jackson)*/- TcpClientAgent() {+ protected TcpClientAgent() {}public TcpClientAgent(String name) {diff --git a/agent/src/main/java/org/openremote/agent/protocol/timer/TimerAgent.java b/agent/src/main/java/org/openremote/agent/protocol/timer/TimerAgent.javaindex dc866c371..7369d2376 100644--- a/agent/src/main/java/org/openremote/agent/protocol/timer/TimerAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/timer/TimerAgent.java@@ -69,8 +69,7 @@ public class TimerAgent extends Agent<TimerAgent, TimerProtocol, TimerAgent.Time/*** For use by hydrators (i.e. JPA/Jackson)*/- TimerAgent() {- this(null);+ protected TimerAgent() {}public TimerAgent(String name) {diff --git a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriAgent.java b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriAgent.javaindex 092184dac..7da403ab3 100644--- a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriAgent.java@@ -43,8 +43,7 @@ public class TradfriAgent extends Agent<TradfriAgent, TradfriProtocol, AgentLink/*** For use by hydrators (i.e. JPA/Jackson)*/- TradfriAgent() {- this(null);+ protected TradfriAgent() {}public TradfriAgent(String name) {diff --git a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriLightAsset.java b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriLightAsset.javaindex ad5dff0ba..eaecb99d9 100644--- a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriLightAsset.java+++ b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriLightAsset.java@@ -20,8 +20,7 @@ public class TradfriLightAsset extends LightAsset implements TradfriAsset {/*** For use by hydrators (i.e. JPA/Jackson)*/- TradfriLightAsset() {- this(null);+ protected TradfriLightAsset() {}public TradfriLightAsset(String name) {diff --git a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriPlugAsset.java b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriPlugAsset.javaindex 140fe5c55..fc1fd0fe4 100644--- a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriPlugAsset.java+++ b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriPlugAsset.java@@ -21,8 +21,7 @@ public class TradfriPlugAsset extends PlugAsset implements TradfriAsset {/*** For use by hydrators (i.e. JPA/Jackson)*/- TradfriPlugAsset() {- this(null);+ protected TradfriPlugAsset() {}public TradfriPlugAsset(String name) {diff --git a/agent/src/main/java/org/openremote/agent/protocol/udp/UdpClientAgent.java b/agent/src/main/java/org/openremote/agent/protocol/udp/UdpClientAgent.javaindex d11063c75..0e10fca24 100644--- a/agent/src/main/java/org/openremote/agent/protocol/udp/UdpClientAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/udp/UdpClientAgent.java@@ -35,7 +35,7 @@ public class UdpClientAgent extends IoAgent<UdpClientAgent, UdpClientProtocol, A/*** For use by hydrators (i.e. JPA/Jackson)*/- UdpClientAgent() {+ protected UdpClientAgent() {}public UdpClientAgent(String name) {diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialAgent.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialAgent.javaindex feebd9712..e359d99e7 100644--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialAgent.java@@ -36,7 +36,7 @@ public class VelbusSerialAgent extends VelbusAgent<VelbusSerialAgent, VelbusSeri/*** For use by hydrators (i.e. JPA/Jackson)*/- VelbusSerialAgent() {+ protected VelbusSerialAgent() {}public VelbusSerialAgent(String name) {diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusTcpAgent.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusTcpAgent.javaindex 7789a14d2..78f362de1 100644--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusTcpAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusTcpAgent.java@@ -37,7 +37,7 @@ public class VelbusTcpAgent extends VelbusAgent<VelbusTcpAgent, VelbusTcpProtoco/*** For use by hydrators (i.e. JPA/Jackson)*/- VelbusTcpAgent() {+ protected VelbusTcpAgent() {}public VelbusTcpAgent(String name) {diff --git a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClientAgent.java b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClientAgent.javaindex 5485bf475..be074bf39 100644--- a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClientAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClientAgent.java@@ -80,7 +80,7 @@ public class WebsocketClientAgent extends IoAgent<WebsocketClientAgent, Websocke/*** For use by hydrators (i.e. JPA/Jackson)*/- WebsocketClientAgent() {+ protected WebsocketClientAgent() {}public WebsocketClientAgent(String name) {diff --git a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWAgent.java b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWAgent.javaindex cee321924..c112bcb53 100644--- a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWAgent.java@@ -65,8 +65,7 @@ public class ZWAgent extends Agent<ZWAgent, ZWProtocol, ZWAgent.ZWAgentLink> {/*** For use by hydrators (i.e. JPA/Jackson)*/- ZWAgent() {- this(null);+ protected ZWAgent() {}public ZWAgent(String name) {diff --git a/deployment/manager/shared/locales/en/or.json b/deployment/manager/shared/locales/en/or.jsonindex d587db034..e14d90307 100644--- a/deployment/manager/shared/locales/en/or.json+++ b/deployment/manager/shared/locales/en/or.json@@ -393,5 +393,7 @@"repetitionEnds": "Repetition ends","repeatOccurrenceEvery": "Repeat occurrence every","daysOfTheWeek": "days of the week",+ "dismiss": "dismiss",+ "createAssetFailed": "Failed to create asset","logCategory": {}}diff --git a/model/src/main/java/org/openremote/model/asset/Asset.java b/model/src/main/java/org/openremote/model/asset/Asset.javaindex 0abbea087..b476a61c3 100644--- a/model/src/main/java/org/openremote/model/asset/Asset.java+++ b/model/src/main/java/org/openremote/model/asset/Asset.java@@ -40,14 +40,8 @@ import org.openremote.model.value.ValueType;import javax.persistence.*;import javax.validation.Valid;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotBlank;-import javax.validation.constraints.Pattern;-import javax.validation.constraints.Size;-import java.util.Arrays;-import java.util.Collection;-import java.util.Date;-import java.util.Optional;+import javax.validation.constraints.*;+import java.util.*;import static javax.persistence.DiscriminatorType.STRING;import static org.openremote.model.Constants.PERSISTENCE_JSON_VALUE_TYPE;@@ -364,7 +358,8 @@ public abstract class Asset<T extends Asset<?>> implements IdentifiableEntity<T>}- public T setName(String name) throws IllegalArgumentException {+ public T setName(@NotNull String name) throws IllegalArgumentException {+ Objects.requireNonNull(name);this.name = name;return (T) this;}diff --git a/model/src/main/java/org/openremote/model/asset/impl/BuildingAsset.java b/model/src/main/java/org/openremote/model/asset/impl/BuildingAsset.javaindex 6eb07a812..615cfb64b 100644--- a/model/src/main/java/org/openremote/model/asset/impl/BuildingAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/BuildingAsset.java@@ -48,8 +48,7 @@ public class BuildingAsset extends CityAsset {/*** For use by hydrators (i.e. JPA/Jackson)*/- BuildingAsset() {- this(null);+ protected BuildingAsset() {}public BuildingAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/CityAsset.java b/model/src/main/java/org/openremote/model/asset/impl/CityAsset.javaindex ccb5a9dc9..66333d839 100644--- a/model/src/main/java/org/openremote/model/asset/impl/CityAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/CityAsset.java@@ -40,8 +40,7 @@ public class CityAsset extends Asset<CityAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- CityAsset() {- this(null);+ protected CityAsset() {}public CityAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/ConsoleAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ConsoleAsset.javaindex 5508a491a..79de4a276 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ConsoleAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ConsoleAsset.java@@ -43,8 +43,7 @@ public class ConsoleAsset extends Asset<ConsoleAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- ConsoleAsset() {- this(null);+ protected ConsoleAsset() {}public ConsoleAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/DoorSensorAsset.java b/model/src/main/java/org/openremote/model/asset/impl/DoorSensorAsset.javaindex b812309d9..20eaeeda9 100644--- a/model/src/main/java/org/openremote/model/asset/impl/DoorSensorAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/DoorSensorAsset.java@@ -42,8 +42,7 @@ public class DoorSensorAsset extends Asset<DoorSensorAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- DoorSensorAsset() {- this(null);+ protected DoorSensorAsset() {}public DoorSensorAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.javaindex 60b50c531..f63754d89 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.java@@ -60,8 +60,7 @@ public class ElectricVehicleAsset extends ElectricityBatteryAsset {/*** For use by hydrators (i.e. JPA/Jackson)*/- ElectricVehicleAsset() {- this(null);+ protected ElectricVehicleAsset() {}public ElectricVehicleAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleFleetGroupAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleFleetGroupAsset.javaindex a8e370ae0..89f21a4a0 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleFleetGroupAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleFleetGroupAsset.java@@ -47,7 +47,7 @@ public class ElectricVehicleFleetGroupAsset extends GroupAsset {public static final AssetDescriptor<ElectricVehicleFleetGroupAsset> DESCRIPTOR = new AssetDescriptor<>("car-multiple", "49B0D8", ElectricVehicleFleetGroupAsset.class);- ElectricVehicleFleetGroupAsset() {+ protected ElectricVehicleFleetGroupAsset() {}public ElectricVehicleFleetGroupAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityAsset.javaindex 8f592a766..60cb12425 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityAsset.java@@ -75,8 +75,7 @@ public abstract class ElectricityAsset<T extends ElectricityAsset<?>> extends As/*** For use by hydrators (i.e. JPA/Jackson)*/- ElectricityAsset() {- this(null);+ protected ElectricityAsset() {}public ElectricityAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityBatteryAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityBatteryAsset.javaindex 257cec392..b3c5c7095 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityBatteryAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityBatteryAsset.java@@ -37,7 +37,7 @@ public class ElectricityBatteryAsset extends ElectricityStorageAsset {public static final AssetDescriptor<ElectricityBatteryAsset> DESCRIPTOR = new AssetDescriptor<>("battery-charging", "1B7C89", ElectricityBatteryAsset.class);- ElectricityBatteryAsset() {+ protected ElectricityBatteryAsset() {}public ElectricityBatteryAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityChargerAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityChargerAsset.javaindex 2211daebf..0f24e98cf 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityChargerAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityChargerAsset.java@@ -71,8 +71,7 @@ public class ElectricityChargerAsset extends ElectricityStorageAsset {/*** For use by hydrators (i.e. JPA/Jackson)*/- ElectricityChargerAsset() {- this(null);+ protected ElectricityChargerAsset() {}public ElectricityChargerAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityConsumerAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityConsumerAsset.javaindex a79d4821e..fdee414c0 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityConsumerAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityConsumerAsset.java@@ -50,8 +50,7 @@ public class ElectricityConsumerAsset extends ElectricityAsset<ElectricityConsum/*** For use by hydrators (i.e. JPA/Jackson)*/- ElectricityConsumerAsset() {- this(null);+ protected ElectricityConsumerAsset() {}public ElectricityConsumerAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerAsset.javaindex a6d0318ff..8ff25b9c0 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerAsset.java@@ -46,7 +46,6 @@ public class ElectricityProducerAsset extends ElectricityAsset<ElectricityProduc* For use by hydrators (i.e. JPA/Jackson)*/ElectricityProducerAsset() {- this(null);}public ElectricityProducerAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerSolarAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerSolarAsset.javaindex f3a6e072e..15a7912b2 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerSolarAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerSolarAsset.java@@ -55,8 +55,7 @@ public class ElectricityProducerSolarAsset extends ElectricityProducerAsset {/*** For use by hydrators (i.e. JPA/Jackson)*/- ElectricityProducerSolarAsset() {- this(null);+ protected ElectricityProducerSolarAsset() {}public ElectricityProducerSolarAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerWindAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerWindAsset.javaindex e86e68387..4cfdb3e07 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerWindAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerWindAsset.java@@ -43,7 +43,10 @@ public class ElectricityProducerWindAsset extends ElectricityProducerAsset {public static final AssetDescriptor<ElectricityProducerWindAsset> DESCRIPTOR = new AssetDescriptor<>("wind-turbine", "4B87EA", ElectricityProducerWindAsset.class);- ElectricityProducerWindAsset() {+ /**+ * For use by hydrators (i.e. JPA/Jackson)+ */+ protected ElectricityProducerWindAsset() {}public ElectricityProducerWindAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityStorageAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityStorageAsset.javaindex 21d9a60f6..1121e7f00 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityStorageAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityStorageAsset.java@@ -59,8 +59,7 @@ public abstract class ElectricityStorageAsset extends ElectricityAsset<Electrici/*** For use by hydrators (i.e. JPA/Jackson)*/- ElectricityStorageAsset() {- this(null);+ protected ElectricityStorageAsset() {}public ElectricityStorageAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricitySupplierAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricitySupplierAsset.javaindex 27c2461d7..657969ba8 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricitySupplierAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricitySupplierAsset.java@@ -57,8 +57,7 @@ public class ElectricitySupplierAsset extends ElectricityAsset<ElectricitySuppli/*** For use by hydrators (i.e. JPA/Jackson)*/- ElectricitySupplierAsset() {- this(null);+ protected ElectricitySupplierAsset() {}public ElectricitySupplierAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/EnvironmentSensorAsset.java b/model/src/main/java/org/openremote/model/asset/impl/EnvironmentSensorAsset.javaindex 010587e57..1640d93a3 100644--- a/model/src/main/java/org/openremote/model/asset/impl/EnvironmentSensorAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/EnvironmentSensorAsset.java@@ -63,8 +63,7 @@ public class EnvironmentSensorAsset extends Asset<EnvironmentSensorAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- EnvironmentSensorAsset() {- this(null);+ protected EnvironmentSensorAsset() {}public EnvironmentSensorAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/GatewayAsset.java b/model/src/main/java/org/openremote/model/asset/impl/GatewayAsset.javaindex ae56b8bf6..76d8aaf52 100644--- a/model/src/main/java/org/openremote/model/asset/impl/GatewayAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/GatewayAsset.java@@ -41,8 +41,7 @@ public class GatewayAsset extends Asset<GatewayAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- GatewayAsset() {- this(null);+ protected GatewayAsset() {}public GatewayAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/GroundwaterSensorAsset.java b/model/src/main/java/org/openremote/model/asset/impl/GroundwaterSensorAsset.javaindex a525dc8fc..f9446d3f4 100644--- a/model/src/main/java/org/openremote/model/asset/impl/GroundwaterSensorAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/GroundwaterSensorAsset.java@@ -47,8 +47,7 @@ public class GroundwaterSensorAsset extends Asset<GroundwaterSensorAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- GroundwaterSensorAsset() {- this(null);+ protected GroundwaterSensorAsset() {}public GroundwaterSensorAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.java b/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.javaindex 23247af05..ff4de5b50 100644--- a/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.java@@ -41,8 +41,7 @@ public class GroupAsset extends Asset<GroupAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- GroupAsset() {- super(null);+ protected GroupAsset() {}public GroupAsset(String name, Class<? extends Asset<?>> childAssetType) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/LightAsset.java b/model/src/main/java/org/openremote/model/asset/impl/LightAsset.javaindex 018929452..b3052ca94 100644--- a/model/src/main/java/org/openremote/model/asset/impl/LightAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/LightAsset.java@@ -49,8 +49,7 @@ public class LightAsset extends Asset<LightAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- LightAsset() {- this(null);+ protected LightAsset() {}public LightAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/MicrophoneAsset.java b/model/src/main/java/org/openremote/model/asset/impl/MicrophoneAsset.javaindex 13eb58ba5..b6f27770e 100644--- a/model/src/main/java/org/openremote/model/asset/impl/MicrophoneAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/MicrophoneAsset.java@@ -40,8 +40,7 @@ public class MicrophoneAsset extends Asset<MicrophoneAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- MicrophoneAsset() {- this(null);+ protected MicrophoneAsset() {}public MicrophoneAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/ParkingAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ParkingAsset.javaindex a98f7b55d..fa4eaf02f 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ParkingAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ParkingAsset.java@@ -44,8 +44,7 @@ public class ParkingAsset extends Asset<ParkingAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- ParkingAsset() {- this(null);+ protected ParkingAsset() {}public ParkingAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/PeopleCounterAsset.java b/model/src/main/java/org/openremote/model/asset/impl/PeopleCounterAsset.javaindex a9a832b49..1149a0d14 100644--- a/model/src/main/java/org/openremote/model/asset/impl/PeopleCounterAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/PeopleCounterAsset.java@@ -42,8 +42,7 @@ public class PeopleCounterAsset extends Asset<PeopleCounterAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- PeopleCounterAsset() {- this(null);+ protected PeopleCounterAsset() {}public PeopleCounterAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/PlugAsset.java b/model/src/main/java/org/openremote/model/asset/impl/PlugAsset.javaindex 08d9459dd..baa34c272 100644--- a/model/src/main/java/org/openremote/model/asset/impl/PlugAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/PlugAsset.java@@ -39,8 +39,7 @@ public class PlugAsset extends Asset<PlugAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- PlugAsset() {- this(null);+ protected PlugAsset() {}public PlugAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/PresenceSensorAsset.java b/model/src/main/java/org/openremote/model/asset/impl/PresenceSensorAsset.javaindex 807c63956..240aac414 100644--- a/model/src/main/java/org/openremote/model/asset/impl/PresenceSensorAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/PresenceSensorAsset.java@@ -40,8 +40,7 @@ public class PresenceSensorAsset extends Asset<PresenceSensorAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- PresenceSensorAsset() {- this(null);+ protected PresenceSensorAsset() {}public PresenceSensorAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/RoomAsset.java b/model/src/main/java/org/openremote/model/asset/impl/RoomAsset.javaindex 70c89ca89..24b84fb26 100644--- a/model/src/main/java/org/openremote/model/asset/impl/RoomAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/RoomAsset.java@@ -41,8 +41,11 @@ public class RoomAsset extends Asset<RoomAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- RoomAsset() {- this(null);+ protected RoomAsset() {+ }++ public RoomAsset(String name) {+ super(name);}public Optional<Integer> getArea() {@@ -52,8 +55,4 @@ public class RoomAsset extends Asset<RoomAsset> {public Optional<Integer> getRoomNumber() {return getAttributes().getValue(ROOM_NUMBER);}-- public RoomAsset(String name) {- super(name);- }}diff --git a/model/src/main/java/org/openremote/model/asset/impl/ShipAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ShipAsset.javaindex 475e49090..49eb60770 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ShipAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ShipAsset.java@@ -51,7 +51,7 @@ public class ShipAsset extends Asset<ShipAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- ShipAsset() {+ protected ShipAsset() {}public ShipAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/ThermostatAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ThermostatAsset.javaindex def827234..54d9cfc91 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ThermostatAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ThermostatAsset.java@@ -47,8 +47,7 @@ public class ThermostatAsset extends Asset<ThermostatAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- ThermostatAsset() {- this(null);+ protected ThermostatAsset() {}public ThermostatAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/ThingAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ThingAsset.javaindex ea329f4ea..99d73e7b4 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ThingAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ThingAsset.java@@ -36,7 +36,7 @@ public class ThingAsset extends Asset<ThingAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- ThingAsset() {+ protected ThingAsset() {}public ThingAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/UnknownAsset.java b/model/src/main/java/org/openremote/model/asset/impl/UnknownAsset.javaindex c67714376..44383aad8 100644--- a/model/src/main/java/org/openremote/model/asset/impl/UnknownAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/UnknownAsset.java@@ -37,6 +37,6 @@ public class UnknownAsset extends Asset<UnknownAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- UnknownAsset() {+ protected UnknownAsset() {}}diff --git a/model/src/main/java/org/openremote/model/asset/impl/VentilationAsset.java b/model/src/main/java/org/openremote/model/asset/impl/VentilationAsset.javaindex 2e51ea0d8..52b5b2891 100644--- a/model/src/main/java/org/openremote/model/asset/impl/VentilationAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/VentilationAsset.java@@ -43,8 +43,7 @@ public class VentilationAsset extends Asset<VentilationAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- VentilationAsset() {- this(null);+ protected VentilationAsset() {}public VentilationAsset(String name) {diff --git a/model/src/main/java/org/openremote/model/asset/impl/WeatherAsset.java b/model/src/main/java/org/openremote/model/asset/impl/WeatherAsset.javaindex 5e6e9125a..b21584461 100644--- a/model/src/main/java/org/openremote/model/asset/impl/WeatherAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/WeatherAsset.java@@ -72,8 +72,7 @@ public class WeatherAsset extends Asset<WeatherAsset> {/*** For use by hydrators (i.e. JPA/Jackson)*/- WeatherAsset() {- this(null);+ protected WeatherAsset() {}public WeatherAsset(String name) {diff --git a/test/src/main/groovy/org/openremote/test/protocol/MockAgent.java b/test/src/main/groovy/org/openremote/test/protocol/MockAgent.javaindex 32545634f..7a1076b47 100644--- a/test/src/main/groovy/org/openremote/test/protocol/MockAgent.java+++ b/test/src/main/groovy/org/openremote/test/protocol/MockAgent.java@@ -61,8 +61,7 @@ public class MockAgent extends Agent<MockAgent, MockProtocol, MockAgent.MockAgen/*** For use by hydrators (i.e. JPA/Jackson)*/- MockAgent() {- this(null);+ protected MockAgent() {}public MockAgent(String name) {diff --git a/test/src/main/groovy/org/openremote/test/protocol/http/HttpServerTestAgent.java b/test/src/main/groovy/org/openremote/test/protocol/http/HttpServerTestAgent.javaindex c0e71494f..b5338f58a 100644--- a/test/src/main/groovy/org/openremote/test/protocol/http/HttpServerTestAgent.java+++ b/test/src/main/groovy/org/openremote/test/protocol/http/HttpServerTestAgent.java@@ -32,7 +32,7 @@ public class HttpServerTestAgent extends AbstractHttpServerAgent<HttpServerTestAHttpServerTestAgent.class, TestHttpServerProtocol.class, AgentLink.Default.class);- HttpServerTestAgent() {}+ protected HttpServerTestAgent() {}public HttpServerTestAgent(String name) {super(name);diff --git a/test/src/main/groovy/org/openremote/test/protocol/velbus/MockVelbusAgent.java b/test/src/main/groovy/org/openremote/test/protocol/velbus/MockVelbusAgent.javaindex beb490467..5b316eb21 100644--- a/test/src/main/groovy/org/openremote/test/protocol/velbus/MockVelbusAgent.java+++ b/test/src/main/groovy/org/openremote/test/protocol/velbus/MockVelbusAgent.java@@ -34,7 +34,7 @@ public class MockVelbusAgent extends VelbusAgent<MockVelbusAgent, MockVelbusProt/*** For use by hydrators (i.e. JPA/Jackson)*/- MockVelbusAgent() {+ protected MockVelbusAgent() {}public MockVelbusAgent(String name) {