From cee8bdfbf4faa493515d1ad3775d229cbc9f344f Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Sat, 19 Oct 2019 10:06:31 -0400 Subject: [PATCH 01/48] Refactor tenant API for Kubernetes CRD implementation. --- build.gradle | 2 +- .../rest/client/tenant/TenantRestTests.java | 103 ----------- .../sitewhere/rest/model/tenant/Tenant.java | 129 ++++++++++++-- .../tenant/request/TenantCreateRequest.java | 163 ++++++++++++++++-- .../com/sitewhere/spi/tenant/ITenant.java | 17 +- .../tenant/request/ITenantCreateRequest.java | 20 ++- 6 files changed, 295 insertions(+), 139 deletions(-) delete mode 100644 sitewhere-java-client/src/test/java/com/sitewhere/rest/client/tenant/TenantRestTests.java diff --git a/build.gradle b/build.gradle index 18beb76..a865d7e 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '2.1.11' + version = '2.2.0' repositories { maven { url "http://repo.maven.apache.org/maven2" } diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/tenant/TenantRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/tenant/TenantRestTests.java deleted file mode 100644 index 6e520fe..0000000 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/tenant/TenantRestTests.java +++ /dev/null @@ -1,103 +0,0 @@ - -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com - * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. - */ -package com.sitewhere.rest.client.tenant; - -import com.sitewhere.rest.client.AbstractCRUDRestClientTests; -import com.sitewhere.rest.model.search.SearchResults; -import com.sitewhere.rest.model.search.tenant.TenantSearchCriteria; -import com.sitewhere.rest.model.tenant.Tenant; -import com.sitewhere.rest.model.tenant.request.TenantCreateRequest; -import com.sitewhere.spi.SiteWhereException; - -/** - * - * @author Jorge Villaverde - */ -public class TenantRestTests extends AbstractCRUDRestClientTests{ - - @Override - protected String knownEntityToken() { - return "workarea"; - } - - // ------------------------------------------------------------------------ - // CREATE - // ------------------------------------------------------------------------ - - @Override - protected TenantCreateRequest buildCreateRequest(String token) throws SiteWhereException { - String name = "test tenant"; - String authenticationToken = "tenant01"; - String logoUrl = "https://s3.amazonaws.com/sitewhere-demo/broken-link.png"; - String tenantTemplateId = "mongodb"; - String datasetTemplateId = "construction"; - TenantCreateRequest.Builder builder = new TenantCreateRequest.Builder(token, name, authenticationToken, logoUrl, tenantTemplateId, - datasetTemplateId); - - builder.withAuthorizedUserId("admin"); - - return builder.build(); - } - - @Override - protected Tenant createEntity(TenantCreateRequest createRequest) throws SiteWhereException { - return getClient().createTenant(createRequest); - } - - // ------------------------------------------------------------------------ - // READ - // ------------------------------------------------------------------------ - - @Override - protected Tenant findEntityByToken(String token) throws SiteWhereException { - return getClient().getTenantByToken(token); - } - - // ------------------------------------------------------------------------ - // UPDATE - // ------------------------------------------------------------------------ - - @Override - protected TenantCreateRequest buildUpdateRequest(String token) throws SiteWhereException { - String name = "test tenant"; - String authenticationToken = "tenant01"; - String logoUrl = "https://s3.amazonaws.com/sitewhere-demo/broken-link.png"; - String tenantTemplateId = null; - String datasetTemplateId = null; - TenantCreateRequest.Builder builder = new TenantCreateRequest.Builder(token, name, authenticationToken, logoUrl, tenantTemplateId, - datasetTemplateId); - builder.withAuthorizedUserId("admin"); - return builder.build(); - } - - @Override - protected Tenant updateEntity(String token, TenantCreateRequest updateRequest) throws SiteWhereException { - return getClient().updateTenant(token, updateRequest); - } - - // ------------------------------------------------------------------------ - // DELETE - // ------------------------------------------------------------------------ - - @Override - protected Tenant deleteEntity(String token) throws SiteWhereException { - return getClient().deleteTenant(token); - } - - // ------------------------------------------------------------------------ - // LIST - // ------------------------------------------------------------------------ - - @Override - protected SearchResults listEntities() throws SiteWhereException { - TenantSearchCriteria searchCriteria = new TenantSearchCriteria(0, 10); - return getClient().listTenants(searchCriteria); - } - -} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/Tenant.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/Tenant.java index 96507ef..19526cf 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/Tenant.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/Tenant.java @@ -9,21 +9,24 @@ import java.util.ArrayList; import java.util.List; +import java.util.Map; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.sitewhere.rest.model.common.BrandedEntity; import com.sitewhere.spi.tenant.ITenant; /** * Default implementation of {@link ITenant} interface used for REST services. */ @JsonInclude(Include.NON_NULL) -public class Tenant extends BrandedEntity implements ITenant { +public class Tenant implements ITenant { /** Serial version UUID */ private static final long serialVersionUID = -353489785570975056L; + /** Unique id */ + private String token; + /** Tenant name */ private String name; @@ -36,16 +39,44 @@ public class Tenant extends BrandedEntity implements ITenant { /** List of user ids authorized to access tenant */ private List authorizedUserIds = new ArrayList(); - /** Tenant template id */ - private String tenantTemplateId; + /** Configuration template id */ + private String configurationTemplateId; /** Dataset template id */ private String datasetTemplateId; + /** Background color */ + private String backgroundColor; + + /** Foreground color */ + private String foregroundColor; + + /** Border color */ + private String borderColor; + + /** Icon */ + private String icon; + + /** Image URL */ + private String imageUrl; + + /** Metadata map */ + private Map metadata; + /* - * (non-Javadoc) - * - * @see com.sitewhere.spi.user.ITenant#getName() + * @see com.sitewhere.spi.tenant.ITenant#getToken() + */ + @Override + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + + /* + * @see com.sitewhere.spi.tenant.ITenant#getName() */ @Override public String getName() { @@ -96,17 +127,15 @@ public void setAuthorizedUserIds(List authorizedUserIds) { } /* - * (non-Javadoc) - * - * @see com.sitewhere.spi.tenant.ITenant#getTenantTemplateId() + * @see com.sitewhere.spi.tenant.ITenant#getConfigurationTemplateId() */ @Override - public String getTenantTemplateId() { - return tenantTemplateId; + public String getConfigurationTemplateId() { + return configurationTemplateId; } - public void setTenantTemplateId(String tenantTemplateId) { - this.tenantTemplateId = tenantTemplateId; + public void setConfigurationTemplateId(String configurationTemplateId) { + this.configurationTemplateId = configurationTemplateId; } /* @@ -120,4 +149,76 @@ public String getDatasetTemplateId() { public void setDatasetTemplateId(String datasetTemplateId) { this.datasetTemplateId = datasetTemplateId; } + + /* + * @see com.sitewhere.spi.common.IColorProvider#getBackgroundColor() + */ + @Override + public String getBackgroundColor() { + return backgroundColor; + } + + public void setBackgroundColor(String backgroundColor) { + this.backgroundColor = backgroundColor; + } + + /* + * @see com.sitewhere.spi.common.IColorProvider#getForegroundColor() + */ + @Override + public String getForegroundColor() { + return foregroundColor; + } + + public void setForegroundColor(String foregroundColor) { + this.foregroundColor = foregroundColor; + } + + /* + * @see com.sitewhere.spi.common.IColorProvider#getBorderColor() + */ + @Override + public String getBorderColor() { + return borderColor; + } + + public void setBorderColor(String borderColor) { + this.borderColor = borderColor; + } + + /* + * @see com.sitewhere.spi.common.IIconProvider#getIcon() + */ + @Override + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + /* + * @see com.sitewhere.spi.common.IImageProvider#getImageUrl() + */ + @Override + public String getImageUrl() { + return imageUrl; + } + + public void setImageUrl(String imageUrl) { + this.imageUrl = imageUrl; + } + + /* + * @see com.sitewhere.spi.common.IMetadataProvider#getMetadata() + */ + @Override + public Map getMetadata() { + return metadata; + } + + public void setMetadata(Map metadata) { + this.metadata = metadata; + } } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/request/TenantCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/request/TenantCreateRequest.java index b73b585..0fb0099 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/request/TenantCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/request/TenantCreateRequest.java @@ -10,10 +10,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.sitewhere.rest.model.common.request.BrandedEntityCreateRequest; import com.sitewhere.spi.tenant.ITenant; import com.sitewhere.spi.tenant.request.ITenantCreateRequest; @@ -22,11 +22,14 @@ * services. */ @JsonInclude(Include.NON_NULL) -public class TenantCreateRequest extends BrandedEntityCreateRequest implements ITenantCreateRequest { +public class TenantCreateRequest implements ITenantCreateRequest { /** Serial version UID */ private static final long serialVersionUID = -5706275554835627264L; + /** Unique id */ + private String token; + /** Tenant name */ private String name; @@ -36,12 +39,42 @@ public class TenantCreateRequest extends BrandedEntityCreateRequest implements I /** List of users authorized for access */ private List authorizedUserIds; - /** Tenant template id */ - private String tenantTemplateId; + /** Configuration template id */ + private String configurationTemplateId; /** Dataset template id */ private String datasetTemplateId; + /** Background color */ + private String backgroundColor; + + /** Foreground color */ + private String foregroundColor; + + /** Border color */ + private String borderColor; + + /** Icon */ + private String icon; + + /** Image URL */ + private String imageUrl; + + /** Metadata */ + private Map metadata; + + /* + * @see com.sitewhere.spi.tenant.request.ITenantCreateRequest#getToken() + */ + @Override + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + /* * @see com.sitewhere.spi.tenant.request.ITenantCreateRequest#getName() */ @@ -82,16 +115,16 @@ public void setAuthorizedUserIds(List authorizedUserIds) { } /* - * @see - * com.sitewhere.spi.tenant.request.ITenantCreateRequest#getTenantTemplateId() + * @see com.sitewhere.spi.tenant.request.ITenantCreateRequest# + * getConfigurationTemplateId() */ @Override - public String getTenantTemplateId() { - return tenantTemplateId; + public String getConfigurationTemplateId() { + return configurationTemplateId; } - public void setTenantTemplateId(String tenantTemplateId) { - this.tenantTemplateId = tenantTemplateId; + public void setConfigurationTemplateId(String configurationTemplateId) { + this.configurationTemplateId = configurationTemplateId; } /* @@ -107,18 +140,95 @@ public void setDatasetTemplateId(String datasetTemplateId) { this.datasetTemplateId = datasetTemplateId; } + /* + * @see com.sitewhere.rest.model.common.request.BrandedEntityCreateRequest# + * getBackgroundColor() + */ + @Override + public String getBackgroundColor() { + return backgroundColor; + } + + public void setBackgroundColor(String backgroundColor) { + this.backgroundColor = backgroundColor; + } + + /* + * @see com.sitewhere.rest.model.common.request.BrandedEntityCreateRequest# + * getForegroundColor() + */ + @Override + public String getForegroundColor() { + return foregroundColor; + } + + public void setForegroundColor(String foregroundColor) { + this.foregroundColor = foregroundColor; + } + + /* + * @see com.sitewhere.rest.model.common.request.BrandedEntityCreateRequest# + * getBorderColor() + */ + @Override + public String getBorderColor() { + return borderColor; + } + + public void setBorderColor(String borderColor) { + this.borderColor = borderColor; + } + + /* + * @see + * com.sitewhere.rest.model.common.request.BrandedEntityCreateRequest#getIcon() + */ + @Override + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + /* + * @see com.sitewhere.rest.model.common.request.BrandedEntityCreateRequest# + * getImageUrl() + */ + @Override + public String getImageUrl() { + return imageUrl; + } + + public void setImageUrl(String imageUrl) { + this.imageUrl = imageUrl; + } + + /* + * @see com.sitewhere.spi.common.IMetadataProvider#getMetadata() + */ + @Override + public Map getMetadata() { + return metadata; + } + + public void setMetadata(Map metadata) { + this.metadata = metadata; + } + public static class Builder { /** Request being built */ private TenantCreateRequest request = new TenantCreateRequest(); - public Builder(String token, String name, String authenticationToken, String logoUrl, String tenantTemplateId, - String datasetTemplateId) { + public Builder(String token, String name, String authenticationToken, String logoUrl, + String configurationTemplateId, String datasetTemplateId) { request.setToken(token); request.setName(name); request.setAuthenticationToken(authenticationToken); request.setImageUrl(logoUrl); - request.setTenantTemplateId(tenantTemplateId); + request.setConfigurationTemplateId(configurationTemplateId); request.setDatasetTemplateId(datasetTemplateId); } @@ -128,11 +238,36 @@ public Builder(ITenant existing) { request.setImageUrl(existing.getImageUrl()); request.setAuthenticationToken(existing.getAuthenticationToken()); request.setAuthorizedUserIds(existing.getAuthorizedUserIds()); - request.setTenantTemplateId(existing.getTenantTemplateId()); + request.setConfigurationTemplateId(existing.getConfigurationTemplateId()); request.setDatasetTemplateId(existing.getDatasetTemplateId()); request.setMetadata(existing.getMetadata()); } + public Builder withBackgroundColor(String color) { + request.setBackgroundColor(color); + return this; + } + + public Builder withForegroundColor(String color) { + request.setForegroundColor(color); + return this; + } + + public Builder withBorderColor(String color) { + request.setBorderColor(color); + return this; + } + + public Builder withIcon(String icon) { + request.setIcon(icon); + return this; + } + + public Builder withImageUrl(String imageUrl) { + request.setImageUrl(imageUrl); + return this; + } + public Builder withAuthorizedUserId(String userId) { if (request.getAuthorizedUserIds() == null) { request.setAuthorizedUserIds(new ArrayList()); diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenant.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenant.java index 26dba76..18a184c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenant.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenant.java @@ -7,14 +7,25 @@ */ package com.sitewhere.spi.tenant; +import java.io.Serializable; import java.util.List; -import com.sitewhere.spi.common.IBrandedEntity; +import com.sitewhere.spi.common.IColorProvider; +import com.sitewhere.spi.common.IIconProvider; +import com.sitewhere.spi.common.IImageProvider; +import com.sitewhere.spi.common.IMetadataProvider; /** * Interface for information about a tenant. */ -public interface ITenant extends IBrandedEntity { +public interface ITenant extends IColorProvider, IIconProvider, IImageProvider, IMetadataProvider, Serializable { + + /** + * Get unique identifier. + * + * @return + */ + public String getToken(); /** * Get tenant name. @@ -42,7 +53,7 @@ public interface ITenant extends IBrandedEntity { * * @return */ - public String getTenantTemplateId(); + public String getConfigurationTemplateId(); /** * Get id of dataset template used to populate tenant. diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/request/ITenantCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/request/ITenantCreateRequest.java index 54e9a29..68e39f2 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/request/ITenantCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/request/ITenantCreateRequest.java @@ -7,14 +7,26 @@ */ package com.sitewhere.spi.tenant.request; +import java.io.Serializable; import java.util.List; -import com.sitewhere.spi.common.request.IBrandedEntityCreateRequest; +import com.sitewhere.spi.common.IColorProvider; +import com.sitewhere.spi.common.IIconProvider; +import com.sitewhere.spi.common.IImageProvider; +import com.sitewhere.spi.common.IMetadataProvider; /** * Interface for arguments needed to create a tenant. */ -public interface ITenantCreateRequest extends IBrandedEntityCreateRequest { +public interface ITenantCreateRequest + extends IColorProvider, IIconProvider, IImageProvider, IMetadataProvider, Serializable { + + /** + * Get unique id. + * + * @return + */ + public String getToken(); /** * Get tenant name. @@ -38,11 +50,11 @@ public interface ITenantCreateRequest extends IBrandedEntityCreateRequest { public List getAuthorizedUserIds(); /** - * Get id of template used to create tenant. + * Get id of configuration template used for tenant. * * @return */ - public String getTenantTemplateId(); + public String getConfigurationTemplateId(); /** * Get id of dataset template used to populate tenant. From b7567a639c70a1bf77f8fab90ae76ffeb22235ab Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Sat, 2 Nov 2019 10:24:12 -0400 Subject: [PATCH 02/48] Support SiteWhere 3.0 (alpha). --- build.gradle | 2 +- sitewhere-java-model/.classpath | 6 ++++++ sitewhere-java-model/src/main/resources/META-INF/beans.xml | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 sitewhere-java-model/src/main/resources/META-INF/beans.xml diff --git a/build.gradle b/build.gradle index a865d7e..57fdf72 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '2.2.0' + version = '3.0.0.alpha1' repositories { maven { url "http://repo.maven.apache.org/maven2" } diff --git a/sitewhere-java-model/.classpath b/sitewhere-java-model/.classpath index 4857be4..467ef2f 100644 --- a/sitewhere-java-model/.classpath +++ b/sitewhere-java-model/.classpath @@ -6,6 +6,12 @@ + + + + + + diff --git a/sitewhere-java-model/src/main/resources/META-INF/beans.xml b/sitewhere-java-model/src/main/resources/META-INF/beans.xml new file mode 100644 index 0000000..4af3581 --- /dev/null +++ b/sitewhere-java-model/src/main/resources/META-INF/beans.xml @@ -0,0 +1 @@ + \ No newline at end of file From c53e252c2b44424e1bc4752cf71073aeaf98d506 Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Sat, 28 Dec 2019 11:28:55 -0500 Subject: [PATCH 03/48] Fixes related to moving to relational model for device management. --- build.gradle | 2 +- .../sitewhere/rest/model/area/AreaType.java | 19 ------------------- .../rest/model/customer/CustomerType.java | 19 ------------------- .../sitewhere/rest/model/device/Device.java | 15 --------------- .../rest/model/device/DeviceType.java | 18 +++++++++--------- .../model/device/element/DeviceElement.java | 5 ++--- .../device/marshaling/MarshaledAreaType.java | 6 +++--- .../marshaling/MarshaledCustomerType.java | 6 +++--- .../request/DeviceTypeCreateRequest.java | 19 ++++++------------- .../com/sitewhere/spi/area/IAreaType.java | 10 ---------- .../sitewhere/spi/customer/ICustomerType.java | 10 ---------- .../com/sitewhere/spi/device/IDevice.java | 9 +-------- .../com/sitewhere/spi/device/IDeviceType.java | 5 +++-- .../spi/device/command/IDeviceCommand.java | 2 +- .../spi/device/element/IDeviceElement.java | 6 +++++- .../spi/device/element/IDeviceUnit.java | 4 ++-- .../request/IDeviceTypeCreateRequest.java | 2 +- .../spi/device/util/DeviceTypeUtils.java | 6 ++++-- 18 files changed, 41 insertions(+), 122 deletions(-) diff --git a/build.gradle b/build.gradle index 57fdf72..0979727 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.alpha1' + version = '3.0.0.alpha2' repositories { maven { url "http://repo.maven.apache.org/maven2" } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/AreaType.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/AreaType.java index d98a3d7..0192264 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/AreaType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/AreaType.java @@ -7,10 +7,6 @@ */ package com.sitewhere.rest.model.area; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.sitewhere.rest.model.common.BrandedEntity; @@ -31,9 +27,6 @@ public class AreaType extends BrandedEntity implements IAreaType { /** Description */ private String description; - /** List of contained area type ids */ - private List containedAreaTypeIds = new ArrayList<>(); - /* * @see com.sitewhere.spi.area.IAreaType#getName() */ @@ -57,16 +50,4 @@ public String getDescription() { public void setDescription(String description) { this.description = description; } - - /* - * @see com.sitewhere.spi.area.IAreaType#getContainedAreaTypeIds() - */ - @Override - public List getContainedAreaTypeIds() { - return containedAreaTypeIds; - } - - public void setContainedAreaTypeIds(List containedAreaTypeIds) { - this.containedAreaTypeIds = containedAreaTypeIds; - } } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/CustomerType.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/CustomerType.java index a94935a..0631e17 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/CustomerType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/CustomerType.java @@ -7,10 +7,6 @@ */ package com.sitewhere.rest.model.customer; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.sitewhere.rest.model.common.BrandedEntity; @@ -31,9 +27,6 @@ public class CustomerType extends BrandedEntity implements ICustomerType { /** Description */ private String description; - /** List of contained area type ids */ - private List containedCustomerTypeIds = new ArrayList<>(); - /* * @see com.sitewhere.spi.customer.ICustomerType#getName() */ @@ -57,16 +50,4 @@ public String getDescription() { public void setDescription(String description) { this.description = description; } - - /* - * @see com.sitewhere.spi.customer.ICustomerType#getContainedCustomerTypeIds() - */ - @Override - public List getContainedCustomerTypeIds() { - return containedCustomerTypeIds; - } - - public void setContainedCustomerTypeIds(List containedCustomerTypeIds) { - this.containedCustomerTypeIds = containedCustomerTypeIds; - } } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/Device.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/Device.java index 6cccd52..0a2cf5f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/Device.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/Device.java @@ -30,9 +30,6 @@ public class Device extends PersistentEntity implements IDevice { /** Device type id */ private UUID deviceTypeId; - /** Ids for active device assignments */ - private List activeDeviceAssignmentIds = new ArrayList<>(); - /** Parent device id (if nested) */ private UUID parentDeviceId; @@ -57,18 +54,6 @@ public void setDeviceTypeId(UUID deviceTypeId) { this.deviceTypeId = deviceTypeId; } - /* - * @see com.sitewhere.spi.device.IDevice#getActiveDeviceAssignmentIds() - */ - @Override - public List getActiveDeviceAssignmentIds() { - return activeDeviceAssignmentIds; - } - - public void setActiveDeviceAssignmentIds(List activeDeviceAssignmentIds) { - this.activeDeviceAssignmentIds = activeDeviceAssignmentIds; - } - /* * @see com.sitewhere.spi.device.IDevice#getParentDeviceId() */ diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceType.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceType.java index c71f663..6281b71 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceType.java @@ -7,13 +7,13 @@ */ package com.sitewhere.rest.model.device; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.sitewhere.rest.model.common.BrandedEntity; -import com.sitewhere.rest.model.device.element.DeviceElementSchema; import com.sitewhere.spi.device.DeviceContainerPolicy; import com.sitewhere.spi.device.IDeviceType; -import com.sitewhere.spi.device.element.IDeviceElementSchema; /** * Model object for device specification information. @@ -33,8 +33,8 @@ public class DeviceType extends BrandedEntity implements IDeviceType { /** Device container policy */ private DeviceContainerPolicy containerPolicy = DeviceContainerPolicy.Standalone; - /** Schema that specifies allowable locations of nested devices */ - private DeviceElementSchema deviceElementSchema; + /** Id of that specifies allowable locations of nested devices */ + private UUID deviceElementSchemaId; /* * @see com.sitewhere.spi.device.IDeviceType#getName() @@ -73,14 +73,14 @@ public void setContainerPolicy(DeviceContainerPolicy containerPolicy) { } /* - * @see com.sitewhere.spi.device.IDeviceType#getDeviceElementSchema() + * @see com.sitewhere.spi.device.IDeviceType#getDeviceElementSchemaId() */ @Override - public IDeviceElementSchema getDeviceElementSchema() { - return deviceElementSchema; + public UUID getDeviceElementSchemaId() { + return deviceElementSchemaId; } - public void setDeviceElementSchema(DeviceElementSchema deviceElementSchema) { - this.deviceElementSchema = deviceElementSchema; + public void setDeviceElementSchemaId(UUID deviceElementSchemaId) { + this.deviceElementSchemaId = deviceElementSchemaId; } } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceElement.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceElement.java index 19a321b..f5d1044 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceElement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceElement.java @@ -7,17 +7,16 @@ */ package com.sitewhere.rest.model.device.element; -import java.io.Serializable; - import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.sitewhere.rest.model.common.PersistentEntity; import com.sitewhere.spi.device.element.IDeviceElement; /** * Default implementation of {@link IDeviceElement}. */ @JsonInclude(Include.NON_NULL) -public class DeviceElement implements IDeviceElement, Serializable { +public class DeviceElement extends PersistentEntity implements IDeviceElement { /** Serialization version identifier */ private static final long serialVersionUID = 8334544031222730874L; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledAreaType.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledAreaType.java index 4f8decf..06fe37f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledAreaType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledAreaType.java @@ -22,13 +22,13 @@ public class MarshaledAreaType extends AreaType { private static final long serialVersionUID = 2440287915755224663L; /** List of contained area types */ - private List containedAreaTypes; + private List containedAreaTypes; - public List getContainedAreaTypes() { + public List getContainedAreaTypes() { return containedAreaTypes; } - public void setContainedAreaTypes(List containedAreaTypes) { + public void setContainedAreaTypes(List containedAreaTypes) { this.containedAreaTypes = containedAreaTypes; } } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledCustomerType.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledCustomerType.java index ad97154..9b90857 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledCustomerType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledCustomerType.java @@ -22,13 +22,13 @@ public class MarshaledCustomerType extends CustomerType { private static final long serialVersionUID = 5902204555479363292L; /** List of contained customer types */ - private List containedCustomerTypes; + private List containedCustomerTypes; - public List getContainedCustomerTypes() { + public List getContainedCustomerTypes() { return containedCustomerTypes; } - public void setContainedCustomerTypes(List containedCustomerTypes) { + public void setContainedCustomerTypes(List containedCustomerTypes) { this.containedCustomerTypes = containedCustomerTypes; } } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceTypeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceTypeCreateRequest.java index 21332bd..7b1055d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceTypeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceTypeCreateRequest.java @@ -16,7 +16,6 @@ import com.sitewhere.rest.model.device.element.DeviceSlot; import com.sitewhere.rest.model.device.element.DeviceUnit; import com.sitewhere.spi.device.DeviceContainerPolicy; -import com.sitewhere.spi.device.element.IDeviceElementSchema; import com.sitewhere.spi.device.request.IDeviceTypeCreateRequest; /** @@ -38,7 +37,7 @@ public class DeviceTypeCreateRequest extends BrandedEntityCreateRequest implemen private DeviceContainerPolicy containerPolicy; /** Device element schema for specifications that support nested devices */ - private DeviceElementSchema deviceElementSchema; + private String deviceElementSchemaToken; /* * @see com.sitewhere.spi.device.request.IDeviceTypeCreateRequest#getName() @@ -81,15 +80,15 @@ public void setContainerPolicy(DeviceContainerPolicy containerPolicy) { /* * @see com.sitewhere.spi.device.request.IDeviceTypeCreateRequest# - * getDeviceElementSchema() + * getDeviceElementSchemaToken() */ @Override - public IDeviceElementSchema getDeviceElementSchema() { - return deviceElementSchema; + public String getDeviceElementSchemaToken() { + return deviceElementSchemaToken; } - public void setDeviceElementSchema(DeviceElementSchema deviceElementSchema) { - this.deviceElementSchema = deviceElementSchema; + public void setDeviceElementSchemaToken(String deviceElementSchemaToken) { + this.deviceElementSchemaToken = deviceElementSchemaToken; } public static class Builder { @@ -119,12 +118,6 @@ public Builder makeComposite() { return this; } - public DeviceElementSchemaBuilder newSchema() { - DeviceElementSchemaBuilder schema = new DeviceElementSchemaBuilder(); - request.setDeviceElementSchema(schema.build()); - return schema; - } - public Builder metadata(String name, String value) { if (request.getMetadata() == null) { request.setMetadata(new HashMap()); diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IAreaType.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IAreaType.java index a5bd363..5f8aac3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IAreaType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IAreaType.java @@ -7,9 +7,6 @@ */ package com.sitewhere.spi.area; -import java.util.List; -import java.util.UUID; - import com.sitewhere.spi.common.IAccessible; import com.sitewhere.spi.common.IBrandedEntity; @@ -18,11 +15,4 @@ * hierarchical area model. */ public interface IAreaType extends IBrandedEntity, IAccessible { - - /** - * Get list of area type ids which may be contained. - * - * @return - */ - public List getContainedAreaTypeIds(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/ICustomerType.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/ICustomerType.java index 61195b2..c889b35 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/ICustomerType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/ICustomerType.java @@ -7,9 +7,6 @@ */ package com.sitewhere.spi.customer; -import java.util.List; -import java.util.UUID; - import com.sitewhere.spi.common.IAccessible; import com.sitewhere.spi.common.IBrandedEntity; @@ -18,11 +15,4 @@ * for building a hierarchical customer model. */ public interface ICustomerType extends IBrandedEntity, IAccessible { - - /** - * Get list of customer type ids which may be contained. - * - * @return - */ - public List getContainedCustomerTypeIds(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDevice.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDevice.java index 34925ba..61d867f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDevice.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDevice.java @@ -25,13 +25,6 @@ public interface IDevice extends IPersistentEntity { */ public UUID getDeviceTypeId(); - /** - * Get device assignment id if assigned. - * - * @return - */ - public List getActiveDeviceAssignmentIds(); - /** * If contained by a parent device, returns the parent device id. * @@ -45,7 +38,7 @@ public interface IDevice extends IPersistentEntity { * * @return */ - public List getDeviceElementMappings(); + public List getDeviceElementMappings(); /** * Get device comments. diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceType.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceType.java index 24fa37f..f016678 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceType.java @@ -7,9 +7,10 @@ */ package com.sitewhere.spi.device; +import java.util.UUID; + import com.sitewhere.spi.common.IAccessible; import com.sitewhere.spi.common.IBrandedEntity; -import com.sitewhere.spi.device.element.IDeviceElementSchema; /** * Specifies details about a given type of device. @@ -28,5 +29,5 @@ public interface IDeviceType extends IBrandedEntity, IAccessible { * * @return */ - public IDeviceElementSchema getDeviceElementSchema(); + public UUID getDeviceElementSchemaId(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommand.java index 1c9e5e6..54e3ba9 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommand.java @@ -37,5 +37,5 @@ public interface IDeviceCommand extends IPersistentEntity, IAccessible { * * @return */ - public List getParameters(); + public List getParameters(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceElement.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceElement.java index d9fff2c..1e17fd7 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceElement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceElement.java @@ -7,10 +7,14 @@ */ package com.sitewhere.spi.device.element; +import java.io.Serializable; + +import com.sitewhere.spi.common.IPersistentEntity; + /** * Common base class for elements in the {@link IDeviceElementSchema} hierarchy. */ -public interface IDeviceElement { +public interface IDeviceElement extends IPersistentEntity, Serializable { /** * Get human-readable name for element. diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceUnit.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceUnit.java index a0547fd..17ad63c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceUnit.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceUnit.java @@ -19,12 +19,12 @@ public interface IDeviceUnit extends IDeviceElement { * * @return */ - public List getDeviceSlots(); + public List getDeviceSlots(); /** * Get list of subordinate units associated with the unit. * * @return */ - public List getDeviceUnits(); + public List getDeviceUnits(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceTypeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceTypeCreateRequest.java index 839107d..a4db560 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceTypeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceTypeCreateRequest.java @@ -29,5 +29,5 @@ public interface IDeviceTypeCreateRequest extends IAccessible, IBrandedEntityCre * * @return */ - public IDeviceElementSchema getDeviceElementSchema(); + public String getDeviceElementSchemaToken(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/util/DeviceTypeUtils.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/util/DeviceTypeUtils.java index 66b4d5a..d14bead 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/util/DeviceTypeUtils.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/util/DeviceTypeUtils.java @@ -10,6 +10,7 @@ import java.util.ArrayDeque; import java.util.Arrays; import java.util.Queue; +import java.util.UUID; import com.sitewhere.spi.SiteWhereException; import com.sitewhere.spi.SiteWhereSystemException; @@ -57,10 +58,11 @@ public static IDeviceElement getDeviceElementByPath(IDeviceType deviceType, Stri } String[] segarray = path.split("[/]"); Queue segments = new ArrayDeque(Arrays.asList(segarray)); - IDeviceUnit unit = deviceType.getDeviceElementSchema(); - if (unit == null) { + UUID schemaId = deviceType.getDeviceElementSchemaId(); + if (schemaId == null) { return null; } + IDeviceUnit unit = null; // TODO: Handle schema lookup. while (segments.size() > 0) { String segment = segments.poll(); if (segments.size() > 0) { From b16bc39a3793a407fcc269789952f633146731e1 Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Sat, 11 Jan 2020 10:50:22 -0500 Subject: [PATCH 04/48] Add/update device state management objects. --- build.gradle | 2 +- .../marshaling/MarshaledDeviceState.java | 88 +++++------- .../rest/model/device/state/DeviceState.java | 50 +------ .../model/device/state/RecentStateEvent.java | 128 ++++++++++++++++++ .../request/DeviceStateCreateRequest.java | 50 ------- .../RecentStateEventCreateRequest.java | 119 ++++++++++++++++ .../device/DeviceStateSearchCriteria.java | 43 +++++- .../RecentStateEventSearchCriteria.java | 78 +++++++++++ .../spi/device/state/IDeviceState.java | 27 +--- .../spi/device/state/IRecentStateEvent.java | 68 ++++++++++ .../request/IDeviceStateCreateRequest.java | 24 +--- .../IRecentStateEventCreateRequest.java | 62 +++++++++ .../device/IDeviceStateSearchCriteria.java | 14 ++ .../IRecentStateEventSearchCriteria.java | 40 ++++++ 14 files changed, 587 insertions(+), 206 deletions(-) create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/RecentStateEvent.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentStateEventCreateRequest.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/RecentStateEventSearchCriteria.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentStateEvent.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentStateEventCreateRequest.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IRecentStateEventSearchCriteria.java diff --git a/build.gradle b/build.gradle index 0979727..d8a5721 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.alpha2' + version = '3.0.0.alpha3' repositories { maven { url "http://repo.maven.apache.org/maven2" } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceState.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceState.java index e5e3fdd..ff415d5 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceState.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceState.java @@ -7,20 +7,18 @@ */ package com.sitewhere.rest.model.device.marshaling; -import java.util.Map; +import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.sitewhere.rest.model.area.Area; +import com.sitewhere.rest.model.asset.Asset; +import com.sitewhere.rest.model.customer.Customer; +import com.sitewhere.rest.model.device.Device; +import com.sitewhere.rest.model.device.DeviceAssignment; +import com.sitewhere.rest.model.device.DeviceType; import com.sitewhere.rest.model.device.state.DeviceState; -import com.sitewhere.spi.area.IArea; -import com.sitewhere.spi.asset.IAsset; -import com.sitewhere.spi.customer.ICustomer; -import com.sitewhere.spi.device.IDevice; -import com.sitewhere.spi.device.IDeviceAssignment; -import com.sitewhere.spi.device.IDeviceType; -import com.sitewhere.spi.device.event.IDeviceAlert; -import com.sitewhere.spi.device.event.IDeviceLocation; -import com.sitewhere.spi.device.event.IDeviceMeasurement; +import com.sitewhere.rest.model.device.state.RecentStateEvent; /** * Extends {@link DeviceState} to support fields that can be included on REST @@ -33,101 +31,79 @@ public class MarshaledDeviceState extends DeviceState { private static final long serialVersionUID = -699681075037936315L; /** Device */ - private IDevice device; + private Device device; /** Device type */ - private IDeviceType deviceType; + private DeviceType deviceType; /** Device assignment */ - private IDeviceAssignment deviceAssignment; + private DeviceAssignment deviceAssignment; /** Assigned customer */ - private ICustomer customer; + private Customer customer; /** Assigned area */ - private IArea area; + private Area area; /** Associated asset */ - private IAsset asset; + private Asset asset; - /** Last device location */ - private IDeviceLocation lastLocationEvent; + /** Recent state events */ + private List recentStatEvents; - /** Map of last measurement events by measurement id */ - private Map lastMeasurementEvents; - - /** Map of last alert events by alert type */ - private Map lastAlertEvents; - - public IDevice getDevice() { + public Device getDevice() { return device; } - public void setDevice(IDevice device) { + public void setDevice(Device device) { this.device = device; } - public IDeviceType getDeviceType() { + public DeviceType getDeviceType() { return deviceType; } - public void setDeviceType(IDeviceType deviceType) { + public void setDeviceType(DeviceType deviceType) { this.deviceType = deviceType; } - public IDeviceAssignment getDeviceAssignment() { + public DeviceAssignment getDeviceAssignment() { return deviceAssignment; } - public void setDeviceAssignment(IDeviceAssignment deviceAssignment) { + public void setDeviceAssignment(DeviceAssignment deviceAssignment) { this.deviceAssignment = deviceAssignment; } - public ICustomer getCustomer() { + public Customer getCustomer() { return customer; } - public void setCustomer(ICustomer customer) { + public void setCustomer(Customer customer) { this.customer = customer; } - public IArea getArea() { + public Area getArea() { return area; } - public void setArea(IArea area) { + public void setArea(Area area) { this.area = area; } - public IAsset getAsset() { + public Asset getAsset() { return asset; } - public void setAsset(IAsset asset) { + public void setAsset(Asset asset) { this.asset = asset; } - public IDeviceLocation getLastLocationEvent() { - return lastLocationEvent; - } - - public void setLastLocationEvent(IDeviceLocation lastLocationEvent) { - this.lastLocationEvent = lastLocationEvent; - } - - public Map getLastMeasurementEvents() { - return lastMeasurementEvents; - } - - public void setLastMeasurementEvents(Map lastMeasurementEvents) { - this.lastMeasurementEvents = lastMeasurementEvents; - } - - public Map getLastAlertEvents() { - return lastAlertEvents; + public List getRecentStatEvents() { + return recentStatEvents; } - public void setLastAlertEvents(Map lastAlertEvents) { - this.lastAlertEvents = lastAlertEvents; + public void setRecentStatEvents(List recentStatEvents) { + this.recentStatEvents = recentStatEvents; } } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/DeviceState.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/DeviceState.java index b96629b..3595b02 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/DeviceState.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/DeviceState.java @@ -8,13 +8,12 @@ package com.sitewhere.rest.model.device.state; import java.util.Date; -import java.util.HashMap; -import java.util.Map; import java.util.UUID; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.sitewhere.rest.model.common.PersistentEntity; import com.sitewhere.rest.model.datatype.JsonDateSerializer; import com.sitewhere.spi.device.state.IDeviceState; @@ -22,7 +21,7 @@ * Model object for device state. */ @JsonInclude(Include.NON_NULL) -public class DeviceState implements IDeviceState { +public class DeviceState extends PersistentEntity implements IDeviceState { /** Serial version UID */ private static final long serialVersionUID = 3438565646525194167L; @@ -54,15 +53,6 @@ public class DeviceState implements IDeviceState { /** Date presence was determined to be missing */ private Date presenceMissingDate; - /** Event id of last location event */ - private UUID lastLocationEventId; - - /** Map of last measurement event ids by mx id */ - private Map lastMeasurementEventIds = new HashMap<>(); - - /** Map of last alert event ids by alert type */ - private Map lastAlertEventIds = new HashMap<>(); - /* * @see com.sitewhere.spi.device.state.IDeviceState#getId() */ @@ -172,40 +162,4 @@ public Date getPresenceMissingDate() { public void setPresenceMissingDate(Date presenceMissingDate) { this.presenceMissingDate = presenceMissingDate; } - - /* - * @see com.sitewhere.spi.device.state.IDeviceState#getLastLocationEventId() - */ - @Override - public UUID getLastLocationEventId() { - return lastLocationEventId; - } - - public void setLastLocationEventId(UUID lastLocationEventId) { - this.lastLocationEventId = lastLocationEventId; - } - - /* - * @see com.sitewhere.spi.device.state.IDeviceState#getLastMeasurementEventIds() - */ - @Override - public Map getLastMeasurementEventIds() { - return lastMeasurementEventIds; - } - - public void setLastMeasurementEventIds(Map lastMeasurementEventIds) { - this.lastMeasurementEventIds = lastMeasurementEventIds; - } - - /* - * @see com.sitewhere.spi.device.state.IDeviceState#getLastAlertEventIds() - */ - @Override - public Map getLastAlertEventIds() { - return lastAlertEventIds; - } - - public void setLastAlertEventIds(Map lastAlertEventIds) { - this.lastAlertEventIds = lastAlertEventIds; - } } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/RecentStateEvent.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/RecentStateEvent.java new file mode 100644 index 0000000..8d88a79 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/RecentStateEvent.java @@ -0,0 +1,128 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.rest.model.device.state; + +import java.util.Date; +import java.util.UUID; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.sitewhere.rest.model.datatype.JsonDateSerializer; +import com.sitewhere.spi.device.event.DeviceEventType; +import com.sitewhere.spi.device.state.IRecentStateEvent; + +/** + * Contains information about a recent event associated with device state. + */ +public class RecentStateEvent implements IRecentStateEvent { + + /** Reference to event id */ + private UUID id; + + /** Device state id */ + private UUID deviceStateId; + + /** Event type */ + private DeviceEventType eventType; + + /** Event classifier */ + private String classifier; + + /** Most recent value */ + private String value; + + /** Event date */ + private Date eventDate; + + /** Reference to event id */ + private UUID eventId; + + /* + * @see com.sitewhere.spi.device.state.IRecentStateEvent#getId() + */ + @Override + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + /* + * @see com.sitewhere.spi.device.state.IRecentStateEvent#getDeviceStateId() + */ + @Override + public UUID getDeviceStateId() { + return deviceStateId; + } + + public void setDeviceStateId(UUID deviceStateId) { + this.deviceStateId = deviceStateId; + } + + /* + * @see com.sitewhere.spi.device.state.IRecentStateEvent#getEventType() + */ + @Override + public DeviceEventType getEventType() { + return eventType; + } + + public void setEventType(DeviceEventType eventType) { + this.eventType = eventType; + } + + /* + * @see com.sitewhere.spi.device.state.IRecentStateEvent#getClassifier() + */ + @Override + public String getClassifier() { + return classifier; + } + + public void setClassifier(String classifier) { + this.classifier = classifier; + } + + /* + * @see com.sitewhere.spi.device.state.IRecentStateEvent#getValue() + */ + @Override + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + /* + * @see com.sitewhere.spi.device.state.IRecentStateEvent#getEventDate() + */ + @Override + @JsonSerialize(using = JsonDateSerializer.class) + public Date getEventDate() { + return eventDate; + } + + public void setEventDate(Date eventDate) { + this.eventDate = eventDate; + } + + /* + * @see com.sitewhere.spi.device.state.IRecentStateEvent#getEventId() + */ + @Override + public UUID getEventId() { + return eventId; + } + + public void setEventId(UUID eventId) { + this.eventId = eventId; + } +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/DeviceStateCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/DeviceStateCreateRequest.java index 422b34d..b6af389 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/DeviceStateCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/DeviceStateCreateRequest.java @@ -8,8 +8,6 @@ package com.sitewhere.rest.model.device.state.request; import java.util.Date; -import java.util.HashMap; -import java.util.Map; import java.util.UUID; import com.sitewhere.spi.device.state.request.IDeviceStateCreateRequest; @@ -46,15 +44,6 @@ public class DeviceStateCreateRequest implements IDeviceStateCreateRequest { /** Date presence was determined to be missing */ private Date presenceMissingDate; - /** Event id of last location event */ - private UUID lastLocationEventId; - - /** Map of last measurement event ids by mx id */ - private Map lastMeasurementEventIds = new HashMap<>(); - - /** Map of last alert event ids by alert type */ - private Map lastAlertEventIds = new HashMap<>(); - /* * @see * com.sitewhere.spi.device.state.request.IDeviceStateCreateRequest#getDeviceId( @@ -159,43 +148,4 @@ public Date getPresenceMissingDate() { public void setPresenceMissingDate(Date presenceMissingDate) { this.presenceMissingDate = presenceMissingDate; } - - /* - * @see com.sitewhere.spi.device.state.request.IDeviceStateCreateRequest# - * getLastLocationEventId() - */ - @Override - public UUID getLastLocationEventId() { - return lastLocationEventId; - } - - public void setLastLocationEventId(UUID lastLocationEventId) { - this.lastLocationEventId = lastLocationEventId; - } - - /* - * @see com.sitewhere.spi.device.state.request.IDeviceStateCreateRequest# - * getLastMeasurementEventIds() - */ - @Override - public Map getLastMeasurementEventIds() { - return lastMeasurementEventIds; - } - - public void setLastMeasurementEventIds(Map lastMeasurementEventIds) { - this.lastMeasurementEventIds = lastMeasurementEventIds; - } - - /* - * @see com.sitewhere.spi.device.state.request.IDeviceStateCreateRequest# - * getLastAlertEventIds() - */ - @Override - public Map getLastAlertEventIds() { - return lastAlertEventIds; - } - - public void setLastAlertEventIds(Map lastAlertEventIds) { - this.lastAlertEventIds = lastAlertEventIds; - } } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentStateEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentStateEventCreateRequest.java new file mode 100644 index 0000000..ff99484 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentStateEventCreateRequest.java @@ -0,0 +1,119 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.rest.model.device.state.request; + +import java.util.Date; +import java.util.UUID; + +import com.sitewhere.spi.device.event.DeviceEventType; +import com.sitewhere.spi.device.state.request.IRecentStateEventCreateRequest; + +/** + * Provides information required to create/update a recent state event. + */ +public class RecentStateEventCreateRequest implements IRecentStateEventCreateRequest { + + /** Serial version UID */ + private static final long serialVersionUID = 6632948781587033978L; + + /** Device state id */ + private UUID deviceStateId; + + /** Event type */ + private DeviceEventType eventType; + + /** Classifier */ + private String classifier; + + /** Value */ + private String value; + + /** Event date */ + private Date eventDate; + + /** Event id */ + private UUID eventId; + + /* + * @see com.sitewhere.spi.device.state.request.IRecentStateEventCreateRequest# + * getDeviceStateId() + */ + @Override + public UUID getDeviceStateId() { + return deviceStateId; + } + + public void setDeviceStateId(UUID deviceStateId) { + this.deviceStateId = deviceStateId; + } + + /* + * @see com.sitewhere.spi.device.state.request.IRecentStateEventCreateRequest# + * getEventType() + */ + @Override + public DeviceEventType getEventType() { + return eventType; + } + + public void setEventType(DeviceEventType eventType) { + this.eventType = eventType; + } + + /* + * @see com.sitewhere.spi.device.state.request.IRecentStateEventCreateRequest# + * getClassifier() + */ + @Override + public String getClassifier() { + return classifier; + } + + public void setClassifier(String classifier) { + this.classifier = classifier; + } + + /* + * @see com.sitewhere.spi.device.state.request.IRecentStateEventCreateRequest# + * getValue() + */ + @Override + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + /* + * @see com.sitewhere.spi.device.state.request.IRecentStateEventCreateRequest# + * getEventDate() + */ + @Override + public Date getEventDate() { + return eventDate; + } + + public void setEventDate(Date eventDate) { + this.eventDate = eventDate; + } + + /* + * @see com.sitewhere.spi.device.state.request.IRecentStateEventCreateRequest# + * getEventId() + */ + @Override + public UUID getEventId() { + return eventId; + } + + public void setEventId(UUID eventId) { + this.eventId = eventId; + } +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceStateSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceStateSearchCriteria.java index 4bbc139..96dbdfb 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceStateSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceStateSearchCriteria.java @@ -21,6 +21,12 @@ public class DeviceStateSearchCriteria extends SearchCriteria implements IDevice /** Filter by last interaction date before a given value */ private Date lastInteractionDateBefore; + /** Device tokens to be included */ + private List deviceTokens; + + /** Device assignment tokens to be included */ + private List deviceAssignmentTokens; + /** Device type tokens to be included */ private List deviceTypeTokens; @@ -43,7 +49,33 @@ public DeviceStateSearchCriteria(int pageNumber, int pageSize) { /* * @see - * com.sitewhere.spi.search.device.IDeviceStateSearchCriteria#getDeviceTypeTokens() + * com.sitewhere.spi.search.device.IDeviceStateSearchCriteria#getDeviceTokens() + */ + @Override + public List getDeviceTokens() { + return deviceTokens; + } + + public void setDeviceTokens(List deviceTokens) { + this.deviceTokens = deviceTokens; + } + + /* + * @see com.sitewhere.spi.search.device.IDeviceStateSearchCriteria# + * getDeviceAssignmentTokens() + */ + @Override + public List getDeviceAssignmentTokens() { + return deviceAssignmentTokens; + } + + public void setDeviceAssignmentTokens(List deviceAssignmentTokens) { + this.deviceAssignmentTokens = deviceAssignmentTokens; + } + + /* + * @see com.sitewhere.spi.search.device.IDeviceStateSearchCriteria# + * getDeviceTypeTokens() */ @Override public List getDeviceTypeTokens() { @@ -56,7 +88,8 @@ public void setDeviceTypeTokens(List deviceTypeTokens) { /* * @see - * com.sitewhere.spi.search.device.IDeviceStateSearchCriteria#getCustomerTokens() + * com.sitewhere.spi.search.device.IDeviceStateSearchCriteria#getCustomerTokens( + * ) */ @Override public List getCustomerTokens() { @@ -68,7 +101,8 @@ public void setCustomerTokens(List customerTokens) { } /* - * @see com.sitewhere.spi.search.device.IDeviceStateSearchCriteria#getAreaTokens() + * @see + * com.sitewhere.spi.search.device.IDeviceStateSearchCriteria#getAreaTokens() */ @Override public List getAreaTokens() { @@ -80,7 +114,8 @@ public void setAreaTokens(List areaTokens) { } /* - * @see com.sitewhere.spi.search.device.IDeviceStateSearchCriteria#getAssetTokens() + * @see + * com.sitewhere.spi.search.device.IDeviceStateSearchCriteria#getAssetTokens() */ @Override public List getAssetTokens() { diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/RecentStateEventSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/RecentStateEventSearchCriteria.java new file mode 100644 index 0000000..65a2da8 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/RecentStateEventSearchCriteria.java @@ -0,0 +1,78 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.rest.model.search.device; + +import java.util.UUID; + +import com.sitewhere.rest.model.search.SearchCriteria; +import com.sitewhere.spi.device.event.DeviceEventType; +import com.sitewhere.spi.search.device.IRecentStateEventSearchCriteria; + +/** + * Provides filter criteria for recent state event searches. + */ +public class RecentStateEventSearchCriteria extends SearchCriteria implements IRecentStateEventSearchCriteria { + + /** Device state id */ + private UUID deviceStateId; + + /** Event type */ + private DeviceEventType eventType; + + /** Classifier */ + private String classifier; + + public RecentStateEventSearchCriteria() { + super(); + } + + public RecentStateEventSearchCriteria(int pageNumber, int pageSize) { + super(pageNumber, pageSize); + } + + /* + * @see com.sitewhere.spi.search.device.IRecentStateEventSearchCriteria# + * getDeviceStateId() + */ + @Override + public UUID getDeviceStateId() { + return deviceStateId; + } + + public void setDeviceStateId(UUID deviceStateId) { + this.deviceStateId = deviceStateId; + } + + /* + * @see + * com.sitewhere.spi.search.device.IRecentStateEventSearchCriteria#getEventType( + * ) + */ + @Override + public DeviceEventType getEventType() { + return eventType; + } + + public void setEventType(DeviceEventType eventType) { + this.eventType = eventType; + } + + /* + * @see + * com.sitewhere.spi.search.device.IRecentStateEventSearchCriteria#getClassifier + * () + */ + @Override + public String getClassifier() { + return classifier; + } + + public void setClassifier(String classifier) { + this.classifier = classifier; + } +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IDeviceState.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IDeviceState.java index c61c57d..eafc94c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IDeviceState.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IDeviceState.java @@ -7,15 +7,15 @@ */ package com.sitewhere.spi.device.state; -import java.io.Serializable; import java.util.Date; -import java.util.Map; import java.util.UUID; +import com.sitewhere.spi.common.IPersistentEntity; + /** * Contains most recent state information for a device. */ -public interface IDeviceState extends Serializable { +public interface IDeviceState extends IPersistentEntity { /** * Get id. @@ -79,25 +79,4 @@ public interface IDeviceState extends Serializable { * @return */ public Date getPresenceMissingDate(); - - /** - * Get event id for last location reported. - * - * @return - */ - public UUID getLastLocationEventId(); - - /** - * Get last measurement event ids indexed by measurement id. - * - * @return - */ - public Map getLastMeasurementEventIds(); - - /** - * Get last alert event ids indexed by alert type. - * - * @return - */ - public Map getLastAlertEventIds(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentStateEvent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentStateEvent.java new file mode 100644 index 0000000..7e874c7 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentStateEvent.java @@ -0,0 +1,68 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.spi.device.state; + +import java.util.Date; +import java.util.UUID; + +import com.sitewhere.spi.device.event.DeviceEventType; + +/** + * Pointer to a recent event related to device state. + */ +public interface IRecentStateEvent { + + /** + * Get unique id. + * + * @return + */ + UUID getId(); + + /** + * Get id of device state entity. + * + * @return + */ + UUID getDeviceStateId(); + + /** + * Get type of event. + * + * @return + */ + DeviceEventType getEventType(); + + /** + * Uniquely classifies an event within a type (e.g. mx name or alert type). + * + * @return + */ + String getClassifier(); + + /** + * Get a string representation of the latest value. + * + * @return + */ + String getValue(); + + /** + * Get date event occurred. + * + * @return + */ + Date getEventDate(); + + /** + * Get unique event id. + * + * @return + */ + UUID getEventId(); +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateCreateRequest.java index f8a256a..2372354 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateCreateRequest.java @@ -9,11 +9,10 @@ import java.io.Serializable; import java.util.Date; -import java.util.Map; import java.util.UUID; /** - * Provides data required to create device assignment state. + * Provides data pertaining to recent device state. */ public interface IDeviceStateCreateRequest extends Serializable { @@ -72,25 +71,4 @@ public interface IDeviceStateCreateRequest extends Serializable { * @return */ public Date getPresenceMissingDate(); - - /** - * Get event id for last location reported. - * - * @return - */ - public UUID getLastLocationEventId(); - - /** - * Get last measurement event ids indexed by measurement id. - * - * @return - */ - public Map getLastMeasurementEventIds(); - - /** - * Get last alert event ids indexed by alert type. - * - * @return - */ - public Map getLastAlertEventIds(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentStateEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentStateEventCreateRequest.java new file mode 100644 index 0000000..3706a8c --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentStateEventCreateRequest.java @@ -0,0 +1,62 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.spi.device.state.request; + +import java.io.Serializable; +import java.util.Date; +import java.util.UUID; + +import com.sitewhere.spi.device.event.DeviceEventType; + +/** + * Request used to create/update a recent device state event. + */ +public interface IRecentStateEventCreateRequest extends Serializable { + + /** + * Get id of device state entity. + * + * @return + */ + UUID getDeviceStateId(); + + /** + * Get type of event. + * + * @return + */ + DeviceEventType getEventType(); + + /** + * Uniquely classifies an event within a type (e.g. mx name or alert type). + * + * @return + */ + String getClassifier(); + + /** + * Get a string representation of the latest value. + * + * @return + */ + String getValue(); + + /** + * Get date event occurred. + * + * @return + */ + Date getEventDate(); + + /** + * Get unique event id. + * + * @return + */ + UUID getEventId(); +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateSearchCriteria.java index 7f545bb..b084d9c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateSearchCriteria.java @@ -25,6 +25,20 @@ public interface IDeviceStateSearchCriteria extends ISearchCriteria { */ public Date getLastInteractionDateBefore(); + /** + * List of devices to be included in results. + * + * @return + */ + public List getDeviceTokens(); + + /** + * List of device assignments to be included in results. + * + * @return + */ + public List getDeviceAssignmentTokens(); + /** * List of device types to be included in results. * diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IRecentStateEventSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IRecentStateEventSearchCriteria.java new file mode 100644 index 0000000..45911d1 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IRecentStateEventSearchCriteria.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.spi.search.device; + +import java.util.UUID; + +import com.sitewhere.spi.device.event.DeviceEventType; +import com.sitewhere.spi.search.ISearchCriteria; + +/** + * Criteria used for filtering recent state events. + */ +public interface IRecentStateEventSearchCriteria extends ISearchCriteria { + + /** + * Get id of device state entity. + * + * @return + */ + UUID getDeviceStateId(); + + /** + * Get type of event. + * + * @return + */ + DeviceEventType getEventType(); + + /** + * Uniquely classifies an event within a type (e.g. mx name or alert type). + * + * @return + */ + String getClassifier(); +} From e1a4a77247b46cec16796a62e65b6c44f50c0ab2 Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Mon, 27 Jan 2020 15:40:37 -0500 Subject: [PATCH 05/48] Remove custom date serializer. Add batch operation model updates. --- build.gradle | 2 +- .../rest/client/SiteWhereClient.java | 15 +++--- .../rest/model/batch/BatchElement.java | 5 +- .../rest/model/batch/BatchOperation.java | 7 ++- .../rest/model/common/PersistentEntity.java | 7 ++- .../model/datatype/JsonDateSerializer.java | 50 ------------------- .../rest/model/device/DeviceAssignment.java | 7 ++- .../model/device/charting/ChartEntry.java | 5 +- .../rest/model/device/event/DeviceEvent.java | 4 -- .../request/DeviceEventCreateRequest.java | 5 +- .../view/DeviceCommandInvocationSummary.java | 7 ++- .../rest/model/device/state/DeviceState.java | 7 ++- .../model/device/state/RecentStateEvent.java | 5 +- .../rest/model/scheduling/Schedule.java | 7 ++- .../com/sitewhere/rest/model/user/User.java | 5 +- 15 files changed, 37 insertions(+), 101 deletions(-) delete mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/rest/model/datatype/JsonDateSerializer.java diff --git a/build.gradle b/build.gradle index d8a5721..82625ff 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.alpha3' + version = '3.0.0.alpha4' repositories { maven { url "http://repo.maven.apache.org/maven2" } diff --git a/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereClient.java b/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereClient.java index e627131..1724a1f 100644 --- a/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereClient.java +++ b/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereClient.java @@ -10,12 +10,14 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; -import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.joda.time.format.DateTimeFormatter; +import org.joda.time.format.ISODateTimeFormat; + import com.sitewhere.rest.model.area.Area; import com.sitewhere.rest.model.area.AreaType; import com.sitewhere.rest.model.area.Zone; @@ -29,13 +31,12 @@ import com.sitewhere.rest.model.asset.request.AssetTypeCreateRequest; import com.sitewhere.rest.model.batch.BatchElement; import com.sitewhere.rest.model.batch.BatchOperation; -import com.sitewhere.rest.model.batch.request.InvocationByDeviceCriteriaRequest; import com.sitewhere.rest.model.batch.request.BatchCommandInvocationRequest; +import com.sitewhere.rest.model.batch.request.InvocationByDeviceCriteriaRequest; import com.sitewhere.rest.model.customer.Customer; import com.sitewhere.rest.model.customer.CustomerType; import com.sitewhere.rest.model.customer.request.CustomerCreateRequest; import com.sitewhere.rest.model.customer.request.CustomerTypeCreateRequest; -import com.sitewhere.rest.model.datatype.JsonDateSerializer; import com.sitewhere.rest.model.device.Device; import com.sitewhere.rest.model.device.DeviceElementMapping; import com.sitewhere.rest.model.device.DeviceStatus; @@ -143,7 +144,7 @@ public class SiteWhereClient implements ISiteWhereClient { /** ISO 8601 Date Fromatter */ - private static SimpleDateFormat iso8601DateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"); + private static DateTimeFormatter ISO8601_FORMATTER = ISODateTimeFormat.dateTime(); /** Default protocol for REST services */ public static final String DEFAULT_PROTOCOL = "http"; @@ -2641,11 +2642,11 @@ protected void addSearchCriteria(Map vars, SearchCriteria criter if (criteria instanceof DateRangeSearchCriteria) { DateRangeSearchCriteria dates = (DateRangeSearchCriteria) criteria; if (dates.getStartDate() != null) { - vars.put("startDate", JsonDateSerializer.serialize(dates.getStartDate())); + vars.put("startDate", ISO8601_FORMATTER.print(dates.getStartDate().getTime())); } if (dates.getEndDate() != null) { - vars.put("endDate", JsonDateSerializer.serialize(dates.getEndDate())); + vars.put("endDate", ISO8601_FORMATTER.print(dates.getEndDate().getTime())); } } } @@ -2688,7 +2689,7 @@ protected String getAuthHeader() { protected String toISO8601(Date date) { if (date == null) return ""; - return iso8601DateFormat.format(date); + return ISO8601_FORMATTER.print(date.getTime()); } protected static String assembleTokenList(List tokenList) { diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/BatchElement.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/BatchElement.java index 99d1d4d..539f888 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/BatchElement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/BatchElement.java @@ -10,11 +10,10 @@ import java.util.Date; import java.util.UUID; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.sitewhere.rest.model.common.MetadataProvider; -import com.sitewhere.rest.model.datatype.JsonDateSerializer; import com.sitewhere.spi.batch.ElementProcessingStatus; import com.sitewhere.spi.batch.IBatchElement; @@ -98,7 +97,7 @@ public void setProcessingStatus(ElementProcessingStatus processingStatus) { * @see com.sitewhere.spi.device.batch.IBatchElement#getProcessedDate() */ @Override - @JsonSerialize(using = JsonDateSerializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) public Date getProcessedDate() { return processedDate; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/BatchOperation.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/BatchOperation.java index 0647c93..eb1682c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/BatchOperation.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/BatchOperation.java @@ -11,11 +11,10 @@ import java.util.HashMap; import java.util.Map; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.sitewhere.rest.model.common.PersistentEntity; -import com.sitewhere.rest.model.datatype.JsonDateSerializer; import com.sitewhere.spi.batch.BatchOperationStatus; import com.sitewhere.spi.batch.IBatchOperation; @@ -90,7 +89,7 @@ public void setProcessingStatus(BatchOperationStatus processingStatus) { * com.sitewhere.spi.device.batch.IBatchOperation#getProcessingStartedDate() */ @Override - @JsonSerialize(using = JsonDateSerializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) public Date getProcessingStartedDate() { return processingStartedDate; } @@ -105,7 +104,7 @@ public void setProcessingStartedDate(Date processingStartedDate) { * @see com.sitewhere.spi.device.batch.IBatchOperation#getProcessingEndedDate() */ @Override - @JsonSerialize(using = JsonDateSerializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) public Date getProcessingEndedDate() { return processingEndedDate; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/PersistentEntity.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/PersistentEntity.java index 420465d..9354367 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/PersistentEntity.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/PersistentEntity.java @@ -10,8 +10,7 @@ import java.util.Date; import java.util.UUID; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.sitewhere.rest.model.datatype.JsonDateSerializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.sitewhere.spi.SiteWhereException; import com.sitewhere.spi.common.IPersistentEntity; @@ -70,7 +69,7 @@ public void setToken(String token) { * @see com.sitewhere.spi.common.IPersistentEntity#getCreatedDate() */ @Override - @JsonSerialize(using = JsonDateSerializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) public Date getCreatedDate() { return createdDate; } @@ -95,7 +94,7 @@ public void setCreatedBy(String createdBy) { * @see com.sitewhere.spi.common.IPersistentEntity#getUpdatedDate() */ @Override - @JsonSerialize(using = JsonDateSerializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) public Date getUpdatedDate() { return updatedDate; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/datatype/JsonDateSerializer.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/datatype/JsonDateSerializer.java deleted file mode 100644 index 5d31d89..0000000 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/datatype/JsonDateSerializer.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com - * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. - */ -package com.sitewhere.rest.model.datatype; - -import java.io.IOException; -import java.util.Date; - -import org.joda.time.DateTimeZone; -import org.joda.time.format.DateTimeFormatter; -import org.joda.time.format.ISODateTimeFormat; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; - -/** - * Used for serializing Calendar objects for JSON output. - */ -public class JsonDateSerializer extends JsonSerializer { - - /* - * (non-Javadoc) - * - * @see - * com.fasterxml.jackson.databind.JsonSerializer#serialize(java.lang.Object, - * com.fasterxml.jackson.core.JsonGenerator, - * com.fasterxml.jackson.databind.SerializerProvider) - */ - public void serialize(Date value, JsonGenerator gen, SerializerProvider arg2) - throws IOException, JsonProcessingException { - gen.writeString(JsonDateSerializer.serialize(value)); - } - - /** - * Serialize a date in ISO 8601 format. - * - * @param value - * @return - */ - public static final String serialize(Date value) { - DateTimeFormatter formatter = ISODateTimeFormat.dateTime().withZone(DateTimeZone.UTC); - return formatter.print(value.getTime()); - } -} \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignment.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignment.java index 3eb9b4b..1ad4f5e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignment.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignment.java @@ -10,11 +10,10 @@ import java.util.Date; import java.util.UUID; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.sitewhere.rest.model.common.PersistentEntity; -import com.sitewhere.rest.model.datatype.JsonDateSerializer; import com.sitewhere.spi.device.DeviceAssignmentStatus; import com.sitewhere.spi.device.IDeviceAssignment; @@ -130,8 +129,8 @@ public void setStatus(DeviceAssignmentStatus status) { * * @see com.sitewhere.spi.device.IDeviceAssignment#getActiveDate() */ - @JsonSerialize(using = JsonDateSerializer.class) @Override + @JsonFormat(shape = JsonFormat.Shape.STRING) public Date getActiveDate() { return activeDate; } @@ -145,8 +144,8 @@ public void setActiveDate(Date activeDate) { * * @see com.sitewhere.spi.device.IDeviceAssignment#getReleasedDate() */ - @JsonSerialize(using = JsonDateSerializer.class) @Override + @JsonFormat(shape = JsonFormat.Shape.STRING) public Date getReleasedDate() { return releasedDate; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/charting/ChartEntry.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/charting/ChartEntry.java index 2879de5..048db57 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/charting/ChartEntry.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/charting/ChartEntry.java @@ -9,8 +9,7 @@ import java.util.Date; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.sitewhere.rest.model.datatype.JsonDateSerializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.sitewhere.spi.device.charting.IChartEntry; /** @@ -47,7 +46,7 @@ public void setValue(T value) { * @see com.sitewhere.spi.device.charting.IChartEntry#getMeasurementDate() */ @Override - @JsonSerialize(using = JsonDateSerializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) public Date getMeasurementDate() { return measurementDate; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEvent.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEvent.java index f78eb87..dc9dc35 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEvent.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEvent.java @@ -13,9 +13,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.sitewhere.rest.model.common.MetadataProvider; -import com.sitewhere.rest.model.datatype.JsonDateSerializer; import com.sitewhere.spi.device.event.DeviceEventType; import com.sitewhere.spi.device.event.IDeviceEvent; @@ -168,7 +166,6 @@ public void setAssetId(UUID assetId) { * @see com.sitewhere.spi.device.IDeviceEvent#getEventDate() */ @Override - @JsonSerialize(using = JsonDateSerializer.class) public Date getEventDate() { return eventDate; } @@ -183,7 +180,6 @@ public void setEventDate(Date eventDate) { * @see com.sitewhere.spi.device.IDeviceEvent#getReceivedDate() */ @Override - @JsonSerialize(using = JsonDateSerializer.class) public Date getReceivedDate() { return receivedDate; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceEventCreateRequest.java index 4b7f0d1..cec9301 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceEventCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceEventCreateRequest.java @@ -10,8 +10,7 @@ import java.util.Date; import java.util.Map; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.sitewhere.rest.model.datatype.JsonDateSerializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.sitewhere.rest.model.device.event.DeviceEvent; import com.sitewhere.spi.device.event.DeviceEventType; import com.sitewhere.spi.device.event.request.IDeviceEventCreateRequest; @@ -74,7 +73,7 @@ public void setEventType(DeviceEventType eventType) { * com.sitewhere.spi.device.request.IDeviceEventCreateRequest#getEventDate() */ @Override - @JsonSerialize(using = JsonDateSerializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) public Date getEventDate() { return eventDate; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/view/DeviceCommandInvocationSummary.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/view/DeviceCommandInvocationSummary.java index d58f278..2929f3e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/view/DeviceCommandInvocationSummary.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/view/DeviceCommandInvocationSummary.java @@ -12,9 +12,8 @@ import java.util.Date; import java.util.List; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonFormat; import com.sitewhere.rest.model.common.MetadataProvider; -import com.sitewhere.rest.model.datatype.JsonDateSerializer; import com.sitewhere.spi.device.command.IDeviceCommand; import com.sitewhere.spi.device.event.IDeviceCommandInvocation; @@ -58,7 +57,7 @@ public void setNamespace(String namespace) { this.namespace = namespace; } - @JsonSerialize(using = JsonDateSerializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) public Date getInvocationDate() { return invocationDate; } @@ -148,7 +147,7 @@ public void setDescription(String description) { this.description = description; } - @JsonSerialize(using = JsonDateSerializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) public Date getDate() { return date; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/DeviceState.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/DeviceState.java index 3595b02..f042961 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/DeviceState.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/DeviceState.java @@ -10,11 +10,10 @@ import java.util.Date; import java.util.UUID; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.sitewhere.rest.model.common.PersistentEntity; -import com.sitewhere.rest.model.datatype.JsonDateSerializer; import com.sitewhere.spi.device.state.IDeviceState; /** @@ -141,7 +140,7 @@ public void setAssetId(UUID assetId) { * @see com.sitewhere.spi.device.state.IDeviceState#getLastInteractionDate() */ @Override - @JsonSerialize(using = JsonDateSerializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) public Date getLastInteractionDate() { return lastInteractionDate; } @@ -154,7 +153,7 @@ public void setLastInteractionDate(Date lastInteractionDate) { * @see com.sitewhere.spi.device.state.IDeviceState#getPresenceMissingDate() */ @Override - @JsonSerialize(using = JsonDateSerializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) public Date getPresenceMissingDate() { return presenceMissingDate; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/RecentStateEvent.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/RecentStateEvent.java index 8d88a79..818a44c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/RecentStateEvent.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/RecentStateEvent.java @@ -10,8 +10,7 @@ import java.util.Date; import java.util.UUID; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.sitewhere.rest.model.datatype.JsonDateSerializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.sitewhere.spi.device.event.DeviceEventType; import com.sitewhere.spi.device.state.IRecentStateEvent; @@ -105,7 +104,7 @@ public void setValue(String value) { * @see com.sitewhere.spi.device.state.IRecentStateEvent#getEventDate() */ @Override - @JsonSerialize(using = JsonDateSerializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) public Date getEventDate() { return eventDate; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/Schedule.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/Schedule.java index 4cf3f4e..6560636 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/Schedule.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/Schedule.java @@ -11,11 +11,10 @@ import java.util.HashMap; import java.util.Map; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.sitewhere.rest.model.common.PersistentEntity; -import com.sitewhere.rest.model.datatype.JsonDateSerializer; import com.sitewhere.spi.scheduling.ISchedule; import com.sitewhere.spi.scheduling.TriggerType; @@ -91,7 +90,7 @@ public void setTriggerConfiguration(Map triggerConfiguration) { * @see com.sitewhere.spi.scheduling.ISchedule#getStartDate() */ @Override - @JsonSerialize(using = JsonDateSerializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) public Date getStartDate() { return startDate; } @@ -106,7 +105,7 @@ public void setStartDate(Date startDate) { * @see com.sitewhere.spi.scheduling.ISchedule#getEndDate() */ @Override - @JsonSerialize(using = JsonDateSerializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) public Date getEndDate() { return endDate; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java index 52ae82b..67e31cd 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java @@ -12,11 +12,10 @@ import java.util.Date; import java.util.List; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.sitewhere.rest.model.common.PersistentEntity; -import com.sitewhere.rest.model.datatype.JsonDateSerializer; import com.sitewhere.spi.SiteWhereException; import com.sitewhere.spi.user.AccountStatus; import com.sitewhere.spi.user.IUser; @@ -103,7 +102,7 @@ public void setLastName(String lastName) { * @see com.sitewhere.spi.user.IUser#getLastLogin() */ @Override - @JsonSerialize(using = JsonDateSerializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING) public Date getLastLogin() { return lastLogin; } From 95acf02ac33e041533c30e7805387dfc75c9401a Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Wed, 29 Jan 2020 18:56:54 -0500 Subject: [PATCH 06/48] Fixes for schedule management. --- build.gradle | 2 +- .../rest/model/scheduling/ScheduledJob.java | 15 ++++++++------- .../sitewhere/spi/scheduling/IScheduledJob.java | 3 ++- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 82625ff..f5b924c 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.alpha4' + version = '3.0.0.alpha5' repositories { maven { url "http://repo.maven.apache.org/maven2" } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/ScheduledJob.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/ScheduledJob.java index 64f9a59..d97ca48 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/ScheduledJob.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/ScheduledJob.java @@ -9,6 +9,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.UUID; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; @@ -26,8 +27,8 @@ public class ScheduledJob extends PersistentEntity implements IScheduledJob { /** Serial version UID */ private static final long serialVersionUID = -8440919585518011992L; - /** Token for associated schedule */ - private String scheduleToken; + /** Id for associated schedule */ + private UUID scheduleId; /** Job type */ private ScheduledJobType jobType; @@ -44,15 +45,15 @@ public class ScheduledJob extends PersistentEntity implements IScheduledJob { private Map context; /* - * @see com.sitewhere.spi.scheduling.IScheduledJob#getScheduleToken() + * @see com.sitewhere.spi.scheduling.IScheduledJob#getScheduleId() */ @Override - public String getScheduleToken() { - return scheduleToken; + public UUID getScheduleId() { + return scheduleId; } - public void setScheduleToken(String scheduleToken) { - this.scheduleToken = scheduleToken; + public void setScheduleId(UUID scheduleId) { + this.scheduleId = scheduleId; } /* diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/IScheduledJob.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/IScheduledJob.java index df7bbb6..2e4f857 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/IScheduledJob.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/IScheduledJob.java @@ -8,6 +8,7 @@ package com.sitewhere.spi.scheduling; import java.util.Map; +import java.util.UUID; import com.sitewhere.spi.common.IPersistentEntity; @@ -21,7 +22,7 @@ public interface IScheduledJob extends IPersistentEntity { * * @return */ - public String getScheduleToken(); + public UUID getScheduleId(); /** * Get job type. From d2f597db83e89db8366c1271b1bb3e94418f8a89 Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Tue, 18 Feb 2020 19:32:37 -0500 Subject: [PATCH 07/48] Derive device group elements from PersistentEntity. --- build.gradle | 2 +- .../device/group/DeviceGroupElement.java | 19 ++----------------- .../DeviceGroupElementCreateRequest.java | 5 +++-- .../spi/device/group/IDeviceGroupElement.java | 11 +++-------- .../IDeviceGroupElementCreateRequest.java | 4 +++- 5 files changed, 12 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle index f5b924c..d5c2959 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.alpha5' + version = '3.0.0.alpha6' repositories { maven { url "http://repo.maven.apache.org/maven2" } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/group/DeviceGroupElement.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/group/DeviceGroupElement.java index b590592..ad06565 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/group/DeviceGroupElement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/group/DeviceGroupElement.java @@ -7,13 +7,13 @@ */ package com.sitewhere.rest.model.device.group; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.UUID; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.sitewhere.rest.model.common.PersistentEntity; import com.sitewhere.spi.device.group.IDeviceGroup; import com.sitewhere.spi.device.group.IDeviceGroupElement; @@ -21,14 +21,11 @@ * Model object for an element in an {@link IDeviceGroup}. */ @JsonInclude(Include.NON_NULL) -public class DeviceGroupElement implements IDeviceGroupElement, Serializable { +public class DeviceGroupElement extends PersistentEntity implements IDeviceGroupElement { /** Serialization version identifier */ private static final long serialVersionUID = -5565956152579362877L; - /** Unqiue id */ - private UUID id; - /** Parent group id */ private UUID groupId; @@ -41,18 +38,6 @@ public class DeviceGroupElement implements IDeviceGroupElement, Serializable { /** List of roles for the element */ private List roles = new ArrayList(); - /* - * @see com.sitewhere.spi.device.group.IDeviceGroupElement#getId() - */ - @Override - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - /* * @see com.sitewhere.spi.device.group.IDeviceGroupElement#getGroupId() */ diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceGroupElementCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceGroupElementCreateRequest.java index 14d34f2..72b2193 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceGroupElementCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceGroupElementCreateRequest.java @@ -7,19 +7,20 @@ */ package com.sitewhere.rest.model.device.request; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.sitewhere.rest.model.common.request.PersistentEntityCreateRequest; import com.sitewhere.spi.device.request.IDeviceGroupElementCreateRequest; /** * Holds fields needed to create a new device group element. */ @JsonInclude(Include.NON_NULL) -public class DeviceGroupElementCreateRequest implements IDeviceGroupElementCreateRequest, Serializable { +public class DeviceGroupElementCreateRequest extends PersistentEntityCreateRequest + implements IDeviceGroupElementCreateRequest { /** Serialization version identifier */ private static final long serialVersionUID = 652319724175005277L; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroupElement.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroupElement.java index 26aec22..9534ab2 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroupElement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroupElement.java @@ -10,17 +10,12 @@ import java.util.List; import java.util.UUID; +import com.sitewhere.spi.common.IPersistentEntity; + /** * Interface for an entry in an {@link IDeviceGroup}. */ -public interface IDeviceGroupElement { - - /** - * Get unique element id. - * - * @return - */ - public UUID getId(); +public interface IDeviceGroupElement extends IPersistentEntity { /** * Get id for parent group. diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupElementCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupElementCreateRequest.java index c35a831..5098d4a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupElementCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupElementCreateRequest.java @@ -9,10 +9,12 @@ import java.util.List; +import com.sitewhere.spi.common.request.IPersistentEntityCreateRequest; + /** * Interface for arguments needed to create a device group element. */ -public interface IDeviceGroupElementCreateRequest { +public interface IDeviceGroupElementCreateRequest extends IPersistentEntityCreateRequest { /** * Get device token (null if nested group supplied). From 7191d844c01c2e8ac86bce11b74d34ea8afac76f Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Thu, 5 Mar 2020 13:58:29 -0500 Subject: [PATCH 08/48] Add microservice summary model. Remove tenant logoUrl(redundant). --- build.gradle | 15 +- .../microservice/MicroserviceSummary.java | 166 ++++++++++++++++++ .../sitewhere/rest/model/tenant/Tenant.java | 14 -- .../microservice/IMicroserviceSummary.java | 84 +++++++++ 4 files changed, 254 insertions(+), 25 deletions(-) create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/rest/model/microservice/MicroserviceSummary.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/microservice/IMicroserviceSummary.java diff --git a/build.gradle b/build.gradle index d5c2959..5ce19e7 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,6 @@ buildscript { maven { url "https://plugins.gradle.org/m2/" } } dependencies { - classpath 'io.spring.gradle:dependency-management-plugin:1.0.3.RELEASE' classpath "gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.14.0" } } @@ -12,24 +11,16 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.alpha6' + version = '3.0.0.alpha7' repositories { - maven { url "http://repo.maven.apache.org/maven2" } + maven { url "https://repo.maven.apache.org/maven2" } } } subprojects { apply plugin: 'eclipse' - // Use Spring dependency management. - apply plugin: 'io.spring.dependency-management' - dependencyManagement { - imports { - mavenBom 'io.spring.platform:platform-bom:Cairo-SR1' - } - } - apply plugin: "com.github.hierynomus.license" license { header rootProject.file('HEADER') @@ -49,6 +40,8 @@ subprojects { // Common dependencies used for all projects. dependencies { + compile platform('io.quarkus:quarkus-bom:1.2.1.Final') + testCompile group: 'junit', name: 'junit' } test { diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/microservice/MicroserviceSummary.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/microservice/MicroserviceSummary.java new file mode 100644 index 0000000..e9ac526 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/microservice/MicroserviceSummary.java @@ -0,0 +1,166 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.rest.model.microservice; + +import com.sitewhere.spi.microservice.IMicroserviceSummary; + +/** + * Provides a subset of information stored in the SiteWhere microservice CRD. + */ +public class MicroserviceSummary implements IMicroserviceSummary { + + /** Id */ + private String id; + + /** Name */ + private String name; + + /** Description */ + private String description; + + /** Functional area */ + private String functionalArea; + + /** Icon displayed in UI */ + private String icon; + + /** Multitenant flag */ + private boolean multitenant; + + /** Tag for Docker image */ + private String dockerImageTag; + + /** Debug enabled flag */ + private boolean debugEnabled; + + /** Debug JDWP port */ + private int debugJdwpPort; + + /** Debug JMX port */ + private int debugJmxPort; + + /* + * @see com.sitewhere.spi.k8s.IMicroserviceSummary#getId() + */ + @Override + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + /* + * @see com.sitewhere.spi.k8s.IMicroserviceSummary#getName() + */ + @Override + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + /* + * @see com.sitewhere.spi.k8s.IMicroserviceSummary#getDescription() + */ + @Override + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + /* + * @see com.sitewhere.spi.k8s.IMicroserviceSummary#getFunctionalArea() + */ + @Override + public String getFunctionalArea() { + return functionalArea; + } + + public void setFunctionalArea(String functionalArea) { + this.functionalArea = functionalArea; + } + + /* + * @see com.sitewhere.spi.k8s.IMicroserviceSummary#getIcon() + */ + @Override + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + /* + * @see com.sitewhere.spi.k8s.IMicroserviceSummary#isMultitenant() + */ + @Override + public boolean isMultitenant() { + return multitenant; + } + + public void setMultitenant(boolean multitenant) { + this.multitenant = multitenant; + } + + /* + * @see com.sitewhere.spi.k8s.IMicroserviceSummary#getDockerImageTag() + */ + @Override + public String getDockerImageTag() { + return dockerImageTag; + } + + public void setDockerImageTag(String dockerImageTag) { + this.dockerImageTag = dockerImageTag; + } + + /* + * @see com.sitewhere.spi.k8s.IMicroserviceSummary#isDebugEnabled() + */ + @Override + public boolean isDebugEnabled() { + return debugEnabled; + } + + public void setDebugEnabled(boolean debugEnabled) { + this.debugEnabled = debugEnabled; + } + + /* + * @see com.sitewhere.spi.k8s.IMicroserviceSummary#getDebugJdwpPort() + */ + @Override + public int getDebugJdwpPort() { + return debugJdwpPort; + } + + public void setDebugJdwpPort(int debugJdwpPort) { + this.debugJdwpPort = debugJdwpPort; + } + + /* + * @see com.sitewhere.spi.k8s.IMicroserviceSummary#getDebugJmxPort() + */ + @Override + public int getDebugJmxPort() { + return debugJmxPort; + } + + public void setDebugJmxPort(int debugJmxPort) { + this.debugJmxPort = debugJmxPort; + } +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/Tenant.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/Tenant.java index 19526cf..b4c40f0 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/Tenant.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/Tenant.java @@ -30,9 +30,6 @@ public class Tenant implements ITenant { /** Tenant name */ private String name; - /** Logo URL */ - private String logoUrl; - /** Device authentication token */ private String authenticationToken; @@ -87,17 +84,6 @@ public void setName(String name) { this.name = name; } - /* - * @see com.sitewhere.spi.tenant.ITenant#getLogoUrl() - */ - public String getLogoUrl() { - return logoUrl; - } - - public void setLogoUrl(String logoUrl) { - this.logoUrl = logoUrl; - } - /* * (non-Javadoc) * diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/microservice/IMicroserviceSummary.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/microservice/IMicroserviceSummary.java new file mode 100644 index 0000000..fb02d96 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/microservice/IMicroserviceSummary.java @@ -0,0 +1,84 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.spi.microservice; + +/** + * Summarizes information about a SiteWhere microservice CRD. + */ +public interface IMicroserviceSummary { + + /** + * Get unique id in k8s namespace. + * + * @return + */ + public String getId(); + + /** + * Get display name. + * + * @return + */ + public String getName(); + + /** + * Get description. + * + * @return + */ + public String getDescription(); + + /** + * Functional area for microservice. + * + * @return + */ + public String getFunctionalArea(); + + /** + * Get icon displayed in UI. + * + * @return + */ + public String getIcon(); + + /** + * Flag for whether microservice is multitenant. + * + * @return + */ + public boolean isMultitenant(); + + /** + * Get tag for Docker image used by microservice. + * + * @return + */ + public String getDockerImageTag(); + + /** + * Flag for whether debug is enabled. + * + * @return + */ + public boolean isDebugEnabled(); + + /** + * Port for Jdwp debugging. + * + * @return + */ + public int getDebugJdwpPort(); + + /** + * Port for JMX debugging. + * + * @return + */ + public int getDebugJmxPort(); +} From 59f4720cffa61eafe0d3b339ac222a086d22fa33 Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Fri, 12 Jun 2020 15:45:15 -0400 Subject: [PATCH 09/48] chore: Bump version to beta1. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5ce19e7..aaca190 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.alpha7' + version = '3.0.0.beta1' repositories { maven { url "https://repo.maven.apache.org/maven2" } From b4b6f417513672fa0c824f0f8ee5ac74eb0ebcf7 Mon Sep 17 00:00:00 2001 From: Luciano Baez Date: Fri, 26 Jun 2020 17:37:53 -0300 Subject: [PATCH 10/48] syncope role - in progress --- build.gradle | 16 ++--- gradle.properties | 6 +- sitewhere-java-client/build.gradle | 20 ++----- .../rest/client/user/UserRestTests.java | 16 ++--- sitewhere-java-model/build.gradle | 19 ++---- .../com/sitewhere/rest/model/user/Role.java | 59 +++++++++++++++++++ .../rest/model/user/RoleSearchCriteria.java | 28 +++++++++ .../com/sitewhere/rest/model/user/User.java | 18 +++++- .../model/user/request/RoleCreateRequest.java | 52 ++++++++++++++++ .../model/user/request/UserCreateRequest.java | 19 +++++- .../java/com/sitewhere/spi/user/IRole.java | 30 ++++++++++ .../spi/user/IRoleSearchCriteria.java | 18 ++++++ .../java/com/sitewhere/spi/user/IUser.java | 21 ++++--- .../spi/user/request/IRoleCreateRequest.java | 36 +++++++++++ .../spi/user/request/IUserCreateRequest.java | 19 ++++-- 15 files changed, 313 insertions(+), 64 deletions(-) create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/Role.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/RoleSearchCriteria.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/RoleCreateRequest.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRole.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRoleSearchCriteria.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IRoleCreateRequest.java diff --git a/build.gradle b/build.gradle index aaca190..802f333 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ buildscript { repositories { + mavenLocal() maven { url "https://plugins.gradle.org/m2/" } } dependencies { @@ -11,37 +12,38 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.beta1' - + version = '3.0.0.beta1-luciano' + repositories { + mavenLocal() maven { url "https://repo.maven.apache.org/maven2" } } } subprojects { apply plugin: 'eclipse' - + apply plugin: "com.github.hierynomus.license" license { header rootProject.file('HEADER') include "**/*.java" } - + // Choose Java settings. apply plugin: 'java' sourceCompatibility = 1.8 targetCompatibility = 1.8 - + tasks.withType(Javadoc) { options.addStringOption('Xdoclint:none', '-quiet') options.addStringOption('encoding', 'UTF-8') options.addStringOption('charSet', 'UTF-8') } - + // Common dependencies used for all projects. dependencies { compile platform('io.quarkus:quarkus-bom:1.2.1.Final') - + testCompile group: 'junit', name: 'junit' } test { diff --git a/gradle.properties b/gradle.properties index 5c8f28c..dc60c22 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -nexusUsername=yourusername -nexusPassword=yourpassword +#nexusUsername=yourusername +#nexusPassword=yourpassword #nexusUrl=https://oss.sonatype.org/content/repositories/snapshots/ -nexusUrl=https://oss.sonatype.org/service/local/staging/deploy/maven2 +#nexusUrl=https://oss.sonatype.org/service/local/staging/deploy/maven2 diff --git a/sitewhere-java-client/build.gradle b/sitewhere-java-client/build.gradle index 3085e3f..a8fc7d5 100644 --- a/sitewhere-java-client/build.gradle +++ b/sitewhere-java-client/build.gradle @@ -3,12 +3,12 @@ description = 'SiteWhere Java Client' apply plugin: 'java' dependencies { compile project(':sitewhere-java-model') - + // Android-compatible REST support. compile group: 'com.squareup.retrofit2', name: 'retrofit', version:'2.5.0' compile group: 'com.squareup.retrofit2', name: 'converter-jackson', version:'2.5.0' compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.12.0' - + testCompile group: 'org.apache.activemq', name: 'activemq-all', version:'5.10.0' } @@ -26,7 +26,7 @@ task javadocJar(type: Jar) { classifier = 'javadoc' } -// Publish jar. +// Publish jar. apply plugin: 'maven-publish' publishing { publications { @@ -55,21 +55,11 @@ publishing { connection = 'https://github.com/sitewhere/sitewhere-java-api.git' url = 'https://github.com/sitewhere/sitewhere-java-api' } - } + } } } repositories { - maven { - url project.nexusUrl - credentials { - username project.nexusUsername - password project.nexusPassword - } - } + mavenLocal() } } -apply plugin: 'signing' -signing { - sign publishing.publications.mavenJava -} diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java index 932fd72..1efb91f 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java @@ -36,11 +36,11 @@ public class UserRestTests extends AbstractCRUDRestClientTests authorities = new ArrayList(); authorities.add("GRP_SERVER"); - request.setAuthorities(authorities); + request.setRoles(authorities); return request; } - + protected String getToken() { return JOHN_DOE_USERNAME; } @@ -86,10 +86,10 @@ protected UserCreateRequest buildUpdateRequest(String token) throws SiteWhereExc request.setLastName("Doe"); request.setStatus(AccountStatus.Active); request.setUsername(JOHN_DOE_USERNAME); - request.setPassword("12345"); + request.setPassword("12345"); List authorities = new ArrayList(); authorities.add("GRP_SERVER"); - request.setAuthorities(authorities); + request.setRoles(authorities); return request; } @@ -110,12 +110,12 @@ protected User deleteEntity(String token) throws SiteWhereException { // ------------------------------------------------------------------------ // LIST // ------------------------------------------------------------------------ - + @Override protected SearchResults listEntities() throws SiteWhereException { return getClient().listUsers(); } - + @Test public void testListUserAuthorities() throws SiteWhereException { SearchResults auths = getClient().listUserAuthorities(knownEntityToken()); diff --git a/sitewhere-java-model/build.gradle b/sitewhere-java-model/build.gradle index b71b329..851661b 100644 --- a/sitewhere-java-model/build.gradle +++ b/sitewhere-java-model/build.gradle @@ -5,7 +5,7 @@ dependencies { // Jackson JSON processing. compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind' compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations' - + // Date/time conversions. compile group: 'joda-time', name: 'joda-time', version:'2.9.1' } @@ -20,7 +20,7 @@ task javadocJar(type: Jar) { classifier = 'javadoc' } -// Publish jar. +// Publish jar. apply plugin: 'maven-publish' publishing { publications { @@ -49,21 +49,10 @@ publishing { connection = 'https://github.com/sitewhere/sitewhere-java-api.git' url = 'https://github.com/sitewhere/sitewhere-java-api' } - } + } } } repositories { - maven { - url project.nexusUrl - credentials { - username project.nexusUsername - password project.nexusPassword - } - } + mavenLocal() } } - -apply plugin: 'signing' -signing { - sign publishing.publications.mavenJava -} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/Role.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/Role.java new file mode 100644 index 0000000..1e09d0e --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/Role.java @@ -0,0 +1,59 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.rest.model.user; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.sitewhere.spi.user.IRole; + +/** + * Model object for a rol. + */ +@JsonInclude(Include.NON_NULL) +public class Role implements IRole { + + /** Serial version UID */ + private static final long serialVersionUID = 872647555610555428L; + + /** Rol */ + private String role; + + /** Description */ + private String description; + + @Override + public String getRole() { + return this.role; + } + + @Override + public String getDescription() { + return this.description; + } + + public void setRole(String role) { + this.role = role; + } + + public void setDescription(String description) { + this.description = description; + } + + /** + * Copy contents from the SPI class. + * + * @param input + * @return + */ + public static Role copy(IRole input) { + Role result = new Role(); + result.setRole(input.getRole()); + result.setDescription(input.getDescription()); + return result; + } +} \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/RoleSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/RoleSearchCriteria.java new file mode 100644 index 0000000..5d477bd --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/RoleSearchCriteria.java @@ -0,0 +1,28 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.rest.model.user; + +import com.sitewhere.rest.model.search.SearchCriteria; +import com.sitewhere.spi.user.IRoleSearchCriteria; + +/** + * Implementation of IRoleSearchCriteria. + */ +public class RoleSearchCriteria extends SearchCriteria implements IRoleSearchCriteria { + + /** Serial version UID */ + private static final long serialVersionUID = 3724218780869928660L; + + public RoleSearchCriteria() { + super(); + } + + public RoleSearchCriteria(int pageNumber, int pageSize) { + super(pageNumber, pageSize); + } +} \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java index 67e31cd..d90ab25 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java @@ -50,6 +50,9 @@ public class User extends PersistentEntity implements IUser { /** List of granted authorities */ private List authorities = new ArrayList<>(); + /** List of roles */ + private List roles = new ArrayList<>(); + /* * @see com.sitewhere.spi.user.IUser#getUsername() */ @@ -135,9 +138,21 @@ public void setAuthorities(List authorities) { this.authorities = authorities; } + /* + * @see com.sitewhere.spi.user.IUser#getRoles() + */ + @Override + public List getRoles() { + return roles; + } + + public void setRoles(List roles) { + this.roles = roles; + } + /** * Copy contents from the SPI class. - * + * * @param input * @return */ @@ -150,6 +165,7 @@ public static User copy(IUser input) throws SiteWhereException { result.setLastLogin(input.getLastLogin()); result.setStatus(input.getStatus()); result.setAuthorities(new ArrayList(input.getAuthorities())); + result.setRoles(new ArrayList(input.getRoles())); PersistentEntity.copy(input, result); return result; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/RoleCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/RoleCreateRequest.java new file mode 100644 index 0000000..6c96999 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/RoleCreateRequest.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.rest.model.user.request; + +import com.sitewhere.spi.user.request.IGrantedAuthorityCreateRequest; +import com.sitewhere.spi.user.request.IRoleCreateRequest; + +/** + * Default implementation of {@link IGrantedAuthorityCreateRequest} for use in + * REST services. + */ +public class RoleCreateRequest implements IRoleCreateRequest { + + /** Serial version UID */ + private static final long serialVersionUID = -2388892324819108444L; + + /** Role name */ + private String role; + + /** Description of the authority */ + private String description; + + /* + * @see + * com.sitewhere.spi.user.request.IRoleCreateRequest#getRole() + */ + @Override + public String getRole() { + return this.role; + } + + public void setRole(String role) { + this.role = role; + } + + /* + * @see + * com.sitewhere.spi.user.request.IRoleCreateRequest#getDescription() + */ + @Override public String getDescription() { + return this.description; + } + + public void setDescription(String description) { + this.description = description; + } +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java index b741141..b357bb6 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java @@ -41,6 +41,9 @@ public class UserCreateRequest extends PersistentEntityCreateRequest implements /** User status */ private AccountStatus status; + /** User authorities */ + private List roles; + /** User authorities */ private List authorities; @@ -104,15 +107,27 @@ public void setStatus(AccountStatus status) { this.status = status; } + /* + * @see com.sitewhere.spi.user.request.IUserCreateRequest#getAuthorities() + */ + @Override + public List getRoles() { + return Collections.unmodifiableList(this.roles); + } + + public void setRoles(List roles) { + this.roles = roles; + } + /* * @see com.sitewhere.spi.user.request.IUserCreateRequest#getAuthorities() */ @Override public List getAuthorities() { - return Collections.unmodifiableList(this.authorities); + return Collections.unmodifiableList(this.authorities); } public void setAuthorities(List authorities) { - this.authorities = authorities; + this.authorities = authorities; } } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRole.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRole.java new file mode 100644 index 0000000..a10f4af --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRole.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.spi.user; + +import java.io.Serializable; + +/** + * Interface for granted authority information. + */ +public interface IRole extends Serializable { + + /** + * Get the rol name. + * + * @return + */ + public String getRole(); + + /** + * Get the description. + * + * @return + */ + public String getDescription(); +} \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRoleSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRoleSearchCriteria.java new file mode 100644 index 0000000..ca5e1c9 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRoleSearchCriteria.java @@ -0,0 +1,18 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.spi.user; + +import com.sitewhere.spi.search.ISearchCriteria; + +import java.io.Serializable; + +/** + * Criteria for searching granted authorities. + */ +public interface IRoleSearchCriteria extends ISearchCriteria, Serializable { +} \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java index 01aa25d..d125610 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java @@ -19,50 +19,57 @@ public interface IUser extends IPersistentEntity { /** * Get the username. - * + * * @return */ public String getUsername(); /** * Get the password. - * + * * @return */ public String getHashedPassword(); /** * Get the common name. - * + * * @return */ public String getFirstName(); /** * Get the surname. - * + * * @return */ public String getLastName(); /** * Get the last login date. - * + * * @return */ public Date getLastLogin(); /** * Get the account status. - * + * * @return */ public AccountStatus getStatus(); /** * Get the list of granted authorities. - * + * * @return */ public List getAuthorities(); + + /** + * Get the list roles. + * + * @return + */ + public List getRoles(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IRoleCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IRoleCreateRequest.java new file mode 100644 index 0000000..cf495d1 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IRoleCreateRequest.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.spi.user.request; + +import java.io.Serializable; + +/** + * Interface for arguments needed to create a role + */ +public interface IRoleCreateRequest extends Serializable { + + /** + * Get the authority name. + * + * @return + */ + public String getRole(); + + /** + * Get the description. + * + * @return + */ + public String getDescription(); + + /** + * Get parent authority. + * + * @return + */ +} \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java index f9153e4..f04ea4b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java @@ -19,42 +19,49 @@ public interface IUserCreateRequest extends IPersistentEntityCreateRequest { /** * Get the username. - * + * * @return */ public String getUsername(); /** * Get the password. - * + * * @return */ public String getPassword(); /** * Get the common name. - * + * * @return */ public String getFirstName(); /** * Get the surname. - * + * * @return */ public String getLastName(); /** * Get the account status. - * + * * @return */ public AccountStatus getStatus(); + /** + * Get the list of roles. + * + * @return + */ + public List getRoles(); + /** * Get the list of granted authorities. - * + * * @return */ public List getAuthorities(); From 949de3ace3444e4dfd9940bb1cb9fa9c59ad144b Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Fri, 26 Jun 2020 19:12:49 -0400 Subject: [PATCH 11/48] chore: Clean up unnecessary 'public' on interface decls. --- build.gradle | 2 +- .../com/sitewhere/spi/ISiteWhereClient.java | 1024 +++++++++++------ .../java/com/sitewhere/spi/area/IArea.java | 2 +- .../sitewhere/spi/area/IBoundedEntity.java | 2 +- .../java/com/sitewhere/spi/area/IZone.java | 12 +- .../spi/area/request/IAreaCreateRequest.java | 4 +- .../area/request/IAreaTypeCreateRequest.java | 2 +- .../spi/area/request/IZoneCreateRequest.java | 14 +- .../java/com/sitewhere/spi/asset/IAsset.java | 4 +- .../com/sitewhere/spi/asset/IAssetType.java | 2 +- .../asset/request/IAssetCreateRequest.java | 4 +- .../request/IAssetTypeCreateRequest.java | 2 +- .../sitewhere/spi/batch/IBatchElement.java | 10 +- .../sitewhere/spi/batch/IBatchOperation.java | 10 +- .../batch/kafka/IUnprocessedBatchElement.java | 2 +- .../kafka/IUnprocessedBatchOperation.java | 4 +- .../IBatchCommandInvocationRequest.java | 8 +- .../request/IBatchElementCreateRequest.java | 8 +- .../request/IBatchOperationCreateRequest.java | 6 +- .../request/IBatchOperationUpdateRequest.java | 6 +- ...InvocationByAssignmentCriteriaRequest.java | 12 +- .../IInvocationByDeviceCriteriaRequest.java | 6 +- .../spi/command/ICommandResponse.java | 4 +- .../com/sitewhere/spi/common/IAccessible.java | 4 +- .../sitewhere/spi/common/IColorProvider.java | 6 +- .../com/sitewhere/spi/common/IFilter.java | 2 +- .../sitewhere/spi/common/IIconProvider.java | 2 +- .../sitewhere/spi/common/IImageProvider.java | 2 +- .../com/sitewhere/spi/common/ILocation.java | 6 +- .../spi/common/IMetadataProvider.java | 2 +- .../spi/common/IPersistentEntity.java | 12 +- .../com/sitewhere/spi/common/ITreeEntity.java | 2 +- .../IPersistentEntityCreateRequest.java | 2 +- .../request/ITreeEntityCreateRequest.java | 2 +- .../com/sitewhere/spi/customer/ICustomer.java | 2 +- .../request/ICustomerCreateRequest.java | 2 +- .../request/ICustomerTypeCreateRequest.java | 2 +- .../com/sitewhere/spi/device/IDevice.java | 10 +- .../sitewhere/spi/device/IDeviceAlarm.java | 24 +- .../spi/device/IDeviceAssignment.java | 16 +- .../spi/device/IDeviceElementMapping.java | 4 +- .../spi/device/IDeviceNestingContext.java | 6 +- .../sitewhere/spi/device/IDeviceStatus.java | 6 +- .../com/sitewhere/spi/device/IDeviceType.java | 4 +- .../device/asset/IDeviceEventWithAsset.java | 2 +- .../spi/device/charting/IChartEntry.java | 4 +- .../spi/device/charting/IChartSeries.java | 4 +- .../spi/device/command/ICommandParameter.java | 6 +- .../spi/device/command/IDeviceCommand.java | 6 +- .../command/IDeviceCommandExecution.java | 6 +- .../command/IDeviceCommandNamespace.java | 4 +- .../command/IDeviceMappingAckCommand.java | 2 +- .../command/IDeviceStreamAckCommand.java | 4 +- .../command/IRegistrationAckCommand.java | 2 +- .../command/IRegistrationFailureCommand.java | 4 +- .../command/ISendDeviceStreamDataCommand.java | 8 +- .../spi/device/command/ISystemCommand.java | 2 +- .../spi/device/element/IDeviceElement.java | 4 +- .../spi/device/element/IDeviceUnit.java | 4 +- .../spi/device/event/IDeviceAlert.java | 8 +- .../event/IDeviceCommandInvocation.java | 12 +- .../device/event/IDeviceCommandResponse.java | 6 +- .../spi/device/event/IDeviceEvent.java | 20 +- .../spi/device/event/IDeviceEventBatch.java | 8 +- .../event/IDeviceEventBatchResponse.java | 6 +- .../spi/device/event/IDeviceEventContext.java | 14 +- .../device/event/IDeviceEventOriginator.java | 2 +- .../spi/device/event/IDeviceLocation.java | 6 +- .../spi/device/event/IDeviceMeasurement.java | 4 +- .../event/IDeviceMeasurementClassifier.java | 2 +- .../spi/device/event/IDeviceStateChange.java | 8 +- .../event/kafka/IDecodedEventPayload.java | 8 +- .../kafka/IDeviceRegistrationPayload.java | 8 +- .../event/kafka/IEnrichedEventPayload.java | 4 +- .../kafka/IPreprocessedEventPayload.java | 4 +- .../request/IDeviceAlertCreateRequest.java | 8 +- .../IDeviceAssignmentEventCreateRequest.java | 4 +- ...IDeviceCommandInvocationCreateRequest.java | 12 +- .../IDeviceCommandResponseCreateRequest.java | 6 +- .../request/IDeviceEventCreateRequest.java | 10 +- .../request/IDeviceLocationCreateRequest.java | 6 +- .../IDeviceMeasurementCreateRequest.java | 4 +- .../request/IDeviceRegistrationRequest.java | 4 +- .../IDeviceStateChangeCreateRequest.java | 8 +- .../request/IDeviceStreamCreateRequest.java | 2 +- .../request/ISendDeviceStreamDataRequest.java | 4 +- .../event/streaming/IEventStreamAck.java | 2 +- .../spi/device/group/IDeviceGroup.java | 2 +- .../spi/device/group/IDeviceGroupElement.java | 8 +- .../request/IDeviceAlarmCreateRequest.java | 16 +- .../request/IDeviceAssignmentBulkRequest.java | 2 +- .../IDeviceAssignmentCreateRequest.java | 10 +- .../request/IDeviceCommandCreateRequest.java | 10 +- .../device/request/IDeviceCreateRequest.java | 12 +- .../request/IDeviceGroupCreateRequest.java | 2 +- .../IDeviceGroupElementCreateRequest.java | 6 +- .../request/IDeviceStatusCreateRequest.java | 6 +- .../request/IDeviceTypeCreateRequest.java | 4 +- .../spi/device/state/IDeviceState.java | 27 +- .../request/IDeviceStateCreateRequest.java | 16 +- .../spi/device/streaming/IDeviceStream.java | 6 +- .../device/streaming/IDeviceStreamData.java | 6 +- .../IDeviceStreamDataCreateRequest.java | 6 +- .../spi/geospatial/IZoneMatcher.java | 6 +- .../spi/geospatial/IZoneRelationship.java | 6 +- .../java/com/sitewhere/spi/label/ILabel.java | 2 +- .../microservice/IMicroserviceSummary.java | 20 +- .../sitewhere/spi/scheduling/ISchedule.java | 10 +- .../spi/scheduling/IScheduledJob.java | 8 +- .../request/IScheduleCreateRequest.java | 10 +- .../request/IScheduledJobCreateRequest.java | 8 +- .../spi/search/IDateRangeSearchCriteria.java | 4 +- .../sitewhere/spi/search/ISearchCriteria.java | 4 +- .../sitewhere/spi/search/ISearchResults.java | 4 +- .../com/sitewhere/spi/search/ITreeNode.java | 8 +- .../spi/search/area/IAreaResponseFormat.java | 6 +- .../spi/search/area/IAreaSearchCriteria.java | 6 +- .../search/area/IAreaTypeSearchCriteria.java | 2 +- .../search/asset/IAssetSearchCriteria.java | 4 +- .../customer/ICustomerResponseFormat.java | 2 +- .../customer/ICustomerSearchCriteria.java | 6 +- .../customer/ICustomerTypeResponseFormat.java | 3 +- .../customer/ICustomerTypeSearchCriteria.java | 1 - .../device/IBatchElementSearchCriteria.java | 2 +- .../device/IDeviceAlarmSearchCriteria.java | 14 +- .../IDeviceAssignmentResponseFormat.java | 10 +- .../IDeviceAssignmentSearchCriteria.java | 12 +- .../device/IDeviceByGroupResponseFormat.java | 2 +- .../device/IDeviceCommandSearchCriteria.java | 2 +- .../IDeviceGroupElementResponseFormat.java | 3 +- .../IDeviceGroupElementSearchCriteria.java | 3 +- .../device/IDeviceGroupSearchCriteria.java | 2 +- .../search/device/IDeviceResponseFormat.java | 5 +- .../search/device/IDeviceSearchCriteria.java | 4 +- .../device/IDeviceStateResponseFormat.java | 15 +- .../device/IDeviceStateSearchCriteria.java | 14 +- .../device/IDeviceStatusSearchCriteria.java | 4 +- .../device/IDeviceTypeResponseFormat.java | 3 +- .../device/IDeviceTypeSearchCriteria.java | 1 - .../search/device/IZoneSearchCriteria.java | 2 +- .../scheduling/IScheduleResponseFormat.java | 1 - .../scheduling/IScheduleSearchCriteria.java | 1 - .../IScheduledJobResponseFormat.java | 2 +- .../IScheduledJobSearchCriteria.java | 1 - .../search/tenant/ITenantSearchCriteria.java | 6 +- .../com/sitewhere/spi/system/IVersion.java | 12 +- .../com/sitewhere/spi/tenant/ITenant.java | 12 +- .../tenant/request/ITenantCreateRequest.java | 12 +- .../sitewhere/spi/user/IGrantedAuthority.java | 8 +- .../java/com/sitewhere/spi/user/IUser.java | 14 +- .../IGrantedAuthorityCreateRequest.java | 8 +- .../spi/user/request/IUserCreateRequest.java | 12 +- 152 files changed, 1124 insertions(+), 842 deletions(-) diff --git a/build.gradle b/build.gradle index aaca190..54c4ad1 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.beta1' + version = '3.0.0.beta2' repositories { maven { url "https://repo.maven.apache.org/maven2" } diff --git a/sitewhere-java-client/src/main/java/com/sitewhere/spi/ISiteWhereClient.java b/sitewhere-java-client/src/main/java/com/sitewhere/spi/ISiteWhereClient.java index cb1764d..bd595b9 100644 --- a/sitewhere-java-client/src/main/java/com/sitewhere/spi/ISiteWhereClient.java +++ b/sitewhere-java-client/src/main/java/com/sitewhere/spi/ISiteWhereClient.java @@ -24,8 +24,8 @@ import com.sitewhere.rest.model.asset.request.AssetTypeCreateRequest; import com.sitewhere.rest.model.batch.BatchElement; import com.sitewhere.rest.model.batch.BatchOperation; -import com.sitewhere.rest.model.batch.request.InvocationByDeviceCriteriaRequest; import com.sitewhere.rest.model.batch.request.BatchCommandInvocationRequest; +import com.sitewhere.rest.model.batch.request.InvocationByDeviceCriteriaRequest; import com.sitewhere.rest.model.customer.Customer; import com.sitewhere.rest.model.customer.CustomerType; import com.sitewhere.rest.model.customer.request.CustomerCreateRequest; @@ -127,7 +127,7 @@ public interface ISiteWhereClient { * @return Initialized ISiteWhereClient. * @throws SiteWhereException */ - public ISiteWhereClient initialize() throws SiteWhereException; + ISiteWhereClient initialize() throws SiteWhereException; // ------------------------------------------------------------------------ // Area Types @@ -136,68 +136,81 @@ public interface ISiteWhereClient { /** * List area types matching criteria. * - * @param tenant Tenant authentication information. Tenant authentication information. - * @param searchCriteria Search criteria object used for filtering Area Type results. - * @return SearchResuts object containing area type matching the criteria provided. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. + * @param searchCriteria + * Search criteria object used for filtering Area Type + * results. + * @return SearchResuts object containing area type matching the + * criteria provided. * @throws SiteWhereException */ - public SearchResults listAreaTypes(ITenantAuthentication tenant, AreaTypeSearchCriteria searchCriteria) + SearchResults listAreaTypes(ITenantAuthentication tenant, AreaTypeSearchCriteria searchCriteria) throws SiteWhereException; /** * Get a area type by token. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param areaTypeToken * @return * @throws SiteWhereException */ - public MarshaledAreaType getAreaTypeByToken(ITenantAuthentication tenant, String areaTypeToken) - throws SiteWhereException; + MarshaledAreaType getAreaTypeByToken(ITenantAuthentication tenant, String areaTypeToken) throws SiteWhereException; /** * Create a new area type. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public AreaType createAreaType(ITenantAuthentication tenant, AreaTypeCreateRequest request) - throws SiteWhereException; + AreaType createAreaType(ITenantAuthentication tenant, AreaTypeCreateRequest request) throws SiteWhereException; /** * Update an existing area type. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param areaTypeToken * @param request * @return * @throws SiteWhereException */ - public AreaType updateAreaType(ITenantAuthentication tenant, String areaTypeToken, AreaTypeCreateRequest request) + AreaType updateAreaType(ITenantAuthentication tenant, String areaTypeToken, AreaTypeCreateRequest request) throws SiteWhereException; /** * Delete an existing area type. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param areaTypeToken * @return * @throws SiteWhereException */ - public AreaType deleteAreaType(ITenantAuthentication tenant, String areaTypeToken) throws SiteWhereException; + AreaType deleteAreaType(ITenantAuthentication tenant, String areaTypeToken) throws SiteWhereException; /** * Get label for area type. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param areaTypeToken * @param generatorId * @return * @throws SiteWhereException */ - public byte[] getLabelForAreaType(ITenantAuthentication tenant, String areaTypeToken, String generatorId) + byte[] getLabelForAreaType(ITenantAuthentication tenant, String areaTypeToken, String generatorId) throws SiteWhereException; // ------------------------------------------------------------------------ @@ -207,162 +220,190 @@ public byte[] getLabelForAreaType(ITenantAuthentication tenant, String areaTypeT /** * List areas matching criteria. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return * @throws SiteWhereException */ - public SearchResults listAreas(ITenantAuthentication tenant, AreaSearchCriteria searchCriteria, + SearchResults listAreas(ITenantAuthentication tenant, AreaSearchCriteria searchCriteria, AreaResponseFormat responseFormat) throws SiteWhereException; /** * Get a area by token. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param areaToken * @return * @throws SiteWhereException */ - public MarshaledArea getAreaByToken(ITenantAuthentication tenant, String areaToken) throws SiteWhereException; + MarshaledArea getAreaByToken(ITenantAuthentication tenant, String areaToken) throws SiteWhereException; /** * Create a new area type. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public Area createArea(ITenantAuthentication tenant, AreaCreateRequest request) throws SiteWhereException; + Area createArea(ITenantAuthentication tenant, AreaCreateRequest request) throws SiteWhereException; /** * Update an existing area type. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param areaToken * @param request * @return * @throws SiteWhereException */ - public Area updateArea(ITenantAuthentication tenant, String areaToken, AreaCreateRequest request) + Area updateArea(ITenantAuthentication tenant, String areaToken, AreaCreateRequest request) throws SiteWhereException; /** * Delete an existing area type. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param areaToken * @return * @throws SiteWhereException */ - public Area deleteArea(ITenantAuthentication tenant, String areaToken) throws SiteWhereException; + Area deleteArea(ITenantAuthentication tenant, String areaToken) throws SiteWhereException; /** * List alerts for an area. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param areaToken * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listAlertsForArea(ITenantAuthentication tenant, String areaToken, + SearchResults listAlertsForArea(ITenantAuthentication tenant, String areaToken, DateRangeSearchCriteria searchCriteria) throws SiteWhereException; /** * List device assignments for an area. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param areaToken * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listDeviceAssignmentsForArea(ITenantAuthentication tenant, + SearchResults listDeviceAssignmentsForArea(ITenantAuthentication tenant, String areaToken, DeviceAssignmentSearchCriteria searchCriteria, DeviceAssignmentResponseFormat responseFormat) throws SiteWhereException; /** * List command invocations for an area. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param areaToken * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listCommandInvocationsForArea(ITenantAuthentication tenant, - String areaToken, DateRangeSearchCriteria searchCriteria) throws SiteWhereException; + SearchResults listCommandInvocationsForArea(ITenantAuthentication tenant, String areaToken, + DateRangeSearchCriteria searchCriteria) throws SiteWhereException; /** * Get label for area. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param areaToken * @param generatorId * @return * @throws SiteWhereException */ - public byte[] getLabelForArea(ITenantAuthentication tenant, String areaToken, String generatorId) + byte[] getLabelForArea(ITenantAuthentication tenant, String areaToken, String generatorId) throws SiteWhereException; /** * List locations for an area. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param areaToken * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listLocationsForArea(ITenantAuthentication tenant, String areaToken, + SearchResults listLocationsForArea(ITenantAuthentication tenant, String areaToken, DateRangeSearchCriteria searchCriteria) throws SiteWhereException; /** * List locations for an area. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param areaToken * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listMeasurementsForArea(ITenantAuthentication tenant, - String areaToken, DateRangeSearchCriteria searchCriteria) throws SiteWhereException; + SearchResults listMeasurementsForArea(ITenantAuthentication tenant, String areaToken, + DateRangeSearchCriteria searchCriteria) throws SiteWhereException; /** * List command responses for an area. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param areaToken * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listCommandResponsesForArea(ITenantAuthentication tenant, + SearchResults listCommandResponsesForArea(ITenantAuthentication tenant, String areaToken, DateRangeSearchCriteria searchCriteria) throws SiteWhereException; /** * List state changes for an area. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param areaToken * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listStateChangesForArea(ITenantAuthentication tenant, - String areaToken, DateRangeSearchCriteria searchCriteria) throws SiteWhereException; + SearchResults listStateChangesForArea(ITenantAuthentication tenant, String areaToken, + DateRangeSearchCriteria searchCriteria) throws SiteWhereException; /** * List all areas in tree format. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @return * @throws SiteWhereException */ - public List areaTree(ITenantAuthentication tenant) throws SiteWhereException; + List areaTree(ITenantAuthentication tenant) throws SiteWhereException; // ------------------------------------------------------------------------ // Asset Types @@ -371,67 +412,78 @@ public SearchResults listStateChangesForArea(ITenant /** * List asset types matching criteria. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listAssetTypes(ITenantAuthentication tenant, AssetTypeSearchCriteria searchCriteria) + SearchResults listAssetTypes(ITenantAuthentication tenant, AssetTypeSearchCriteria searchCriteria) throws SiteWhereException; /** * Get a asset type by token. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param assetTypeToken * @return * @throws SiteWhereException */ - public AssetType getAssetTypeByToken(ITenantAuthentication tenant, String assetTypeToken) throws SiteWhereException; + AssetType getAssetTypeByToken(ITenantAuthentication tenant, String assetTypeToken) throws SiteWhereException; /** * Create a new asset type type. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public AssetType createAssetType(ITenantAuthentication tenant, AssetTypeCreateRequest request) - throws SiteWhereException; + AssetType createAssetType(ITenantAuthentication tenant, AssetTypeCreateRequest request) throws SiteWhereException; /** * Update an existing asset type type. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param assetTypeToken * @param request * @return * @throws SiteWhereException */ - public AssetType updateAssetType(ITenantAuthentication tenant, String assetTypeToken, - AssetTypeCreateRequest request) throws SiteWhereException; + AssetType updateAssetType(ITenantAuthentication tenant, String assetTypeToken, AssetTypeCreateRequest request) + throws SiteWhereException; /** * Delete an existing asset type type. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param assetTypeToken * @return * @throws SiteWhereException */ - public AssetType deleteAssetType(ITenantAuthentication tenant, String assetTypeToken) throws SiteWhereException; + AssetType deleteAssetType(ITenantAuthentication tenant, String assetTypeToken) throws SiteWhereException; /** * Get label for asset type. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param assetTypeToken * @param generatorId * @return * @throws SiteWhereException */ - public byte[] getLabelForAssetType(ITenantAuthentication tenant, String assetTypeToken, String generatorId) + byte[] getLabelForAssetType(ITenantAuthentication tenant, String assetTypeToken, String generatorId) throws SiteWhereException; // ------------------------------------------------------------------------ @@ -441,66 +493,78 @@ public byte[] getLabelForAssetType(ITenantAuthentication tenant, String assetTyp /** * List assets matching criteria. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listAssets(ITenantAuthentication tenant, AssetSearchCriteria searchCriteria) + SearchResults listAssets(ITenantAuthentication tenant, AssetSearchCriteria searchCriteria) throws SiteWhereException; /** * Get a asset by token. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param assetToken * @return * @throws SiteWhereException */ - public MarshaledAsset getAssetByToken(ITenantAuthentication tenant, String assetToken) throws SiteWhereException; + MarshaledAsset getAssetByToken(ITenantAuthentication tenant, String assetToken) throws SiteWhereException; /** * Create a new asset. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public Asset createAsset(ITenantAuthentication tenant, AssetCreateRequest request) throws SiteWhereException; + Asset createAsset(ITenantAuthentication tenant, AssetCreateRequest request) throws SiteWhereException; /** * Update an existing asset. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param assetToken * @param request * @return * @throws SiteWhereException */ - public Asset updateAsset(ITenantAuthentication tenant, String assetToken, AssetCreateRequest request) + Asset updateAsset(ITenantAuthentication tenant, String assetToken, AssetCreateRequest request) throws SiteWhereException; /** * Delete an existing asset. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param assetToken * @return * @throws SiteWhereException */ - public Asset deleteAsset(ITenantAuthentication tenant, String assetToken) throws SiteWhereException; + Asset deleteAsset(ITenantAuthentication tenant, String assetToken) throws SiteWhereException; /** * Get label for asset. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param assetToken * @param generatorId * @return * @throws SiteWhereException */ - public byte[] getLabelForAsset(ITenantAuthentication tenant, String assetToken, String generatorId) + byte[] getLabelForAsset(ITenantAuthentication tenant, String assetToken, String generatorId) throws SiteWhereException; // ------------------------------------------------------------------------ @@ -510,343 +574,399 @@ public byte[] getLabelForAsset(ITenantAuthentication tenant, String assetToken, /** * List device assignment matching criteria. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param format * @return * @throws SiteWhereException */ - public SearchResults listDeviceAssignments(ITenantAuthentication tenant, + SearchResults listDeviceAssignments(ITenantAuthentication tenant, DeviceAssignmentSearchCriteria searchCriteria, DeviceAssignmentResponseFormat format) throws SiteWhereException; /** * Get a device assignment by token. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException */ - public MarshaledDeviceAssignment getDeviceAssignmentByToken(ITenantAuthentication tenant, String token) + MarshaledDeviceAssignment getDeviceAssignmentByToken(ITenantAuthentication tenant, String token) throws SiteWhereException; /** * Create a new device assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public MarshaledDeviceAssignment createDeviceAssignment(ITenantAuthentication tenant, + MarshaledDeviceAssignment createDeviceAssignment(ITenantAuthentication tenant, DeviceAssignmentCreateRequest request) throws SiteWhereException; /** * Update an existing device assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return * @throws SiteWhereException */ - public MarshaledDeviceAssignment updateDeviceAssignment(ITenantAuthentication tenant, String token, + MarshaledDeviceAssignment updateDeviceAssignment(ITenantAuthentication tenant, String token, DeviceAssignmentCreateRequest request) throws SiteWhereException; /** * Delete an existing device assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException */ - public MarshaledDeviceAssignment deleteDeviceAssignment(ITenantAuthentication tenant, String token) + MarshaledDeviceAssignment deleteDeviceAssignment(ITenantAuthentication tenant, String token) throws SiteWhereException; /** * List alerts for a device assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param token * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listAlertsForDeviceAssignment(ITenantAuthentication tenant, String token, + SearchResults listAlertsForDeviceAssignment(ITenantAuthentication tenant, String token, DateRangeSearchCriteria searchCriteria) throws SiteWhereException; /** * Create alert event for device assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return * @throws SiteWhereException */ - public DeviceAlertWithAsset createAlertForDeviceAssignment(ITenantAuthentication tenant, String token, + DeviceAlertWithAsset createAlertForDeviceAssignment(ITenantAuthentication tenant, String token, DeviceAlertCreateRequest request) throws SiteWhereException; /** * Release an active device assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException */ - public MarshaledDeviceAssignment releaseDeviceAssignment(ITenantAuthentication tenant, String token) + MarshaledDeviceAssignment releaseDeviceAssignment(ITenantAuthentication tenant, String token) throws SiteWhereException; /** * List command invocations for a device assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param token * @param includeCommand * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listCommandInvocationsForDeviceAssignment( - ITenantAuthentication tenant, String token, Boolean includeCommand, DateRangeSearchCriteria searchCriteria) - throws SiteWhereException; + SearchResults listCommandInvocationsForDeviceAssignment(ITenantAuthentication tenant, + String token, Boolean includeCommand, DateRangeSearchCriteria searchCriteria) throws SiteWhereException; /** * Create command invocation event for assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return * @throws SiteWhereException */ - public DeviceCommandInvocation createCommandInvocationForDeviceAssignment(ITenantAuthentication tenant, - String token, DeviceCommandInvocationCreateRequest request) throws SiteWhereException; + DeviceCommandInvocation createCommandInvocationForDeviceAssignment(ITenantAuthentication tenant, String token, + DeviceCommandInvocationCreateRequest request) throws SiteWhereException; /** * Schedule command invocation. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param token * @param scheduleToken * @param request * @return * @throws SiteWhereException */ - public ScheduledJob scheduleCommandInvocation(ITenantAuthentication tenant, String token, String scheduleToken, + ScheduledJob scheduleCommandInvocation(ITenantAuthentication tenant, String token, String scheduleToken, DeviceCommandInvocationCreateRequest request) throws SiteWhereException; /** * Get label for device assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param token * @param generatorId * @return * @throws SiteWhereException */ - public byte[] getLabelForDeviceAssignment(ITenantAuthentication tenant, String token, String generatorId) + byte[] getLabelForDeviceAssignment(ITenantAuthentication tenant, String token, String generatorId) throws SiteWhereException; /** * List location events for device assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param token * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listLocationsForDeviceAssignment(ITenantAuthentication tenant, - String token, DateRangeSearchCriteria searchCriteria) throws SiteWhereException; + SearchResults listLocationsForDeviceAssignment(ITenantAuthentication tenant, String token, + DateRangeSearchCriteria searchCriteria) throws SiteWhereException; /** * Create location event for assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return * @throws SiteWhereException */ - public DeviceLocationWithAsset createLocationForDeviceAssignment(ITenantAuthentication tenant, String token, + DeviceLocationWithAsset createLocationForDeviceAssignment(ITenantAuthentication tenant, String token, DeviceLocationCreateRequest request) throws SiteWhereException; /** * List measurement events for device assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param token * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listMeasurementsForDeviceAssignment(ITenantAuthentication tenant, + SearchResults listMeasurementsForDeviceAssignment(ITenantAuthentication tenant, String token, DateRangeSearchCriteria searchCriteria) throws SiteWhereException; /** * Create location event for assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return * @throws SiteWhereException */ - public DeviceMeasurementWithAsset createMeasurementForDeviceAssignment(ITenantAuthentication tenant, String token, + DeviceMeasurementWithAsset createMeasurementForDeviceAssignment(ITenantAuthentication tenant, String token, DeviceMeasurementCreateRequest request) throws SiteWhereException; /** * List assignment measurements as chart series. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param token * @param searchCriteria * @return * @throws SiteWhereException */ - public List> listMeasurementsForDeviceAssignmentAsChartSeries(ITenantAuthentication tenant, + List> listMeasurementsForDeviceAssignmentAsChartSeries(ITenantAuthentication tenant, String token, DateRangeSearchCriteria searchCriteria) throws SiteWhereException; /** * Mark device assignment as missing. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException */ - public MarshaledDeviceAssignment markMissingDeviceAssignment(ITenantAuthentication tenant, String token) + MarshaledDeviceAssignment markMissingDeviceAssignment(ITenantAuthentication tenant, String token) throws SiteWhereException; /** * List command response events for assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param token * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listCommandResponsesForDeviceAssignment( - ITenantAuthentication tenant, String token, DateRangeSearchCriteria searchCriteria) - throws SiteWhereException; + SearchResults listCommandResponsesForDeviceAssignment(ITenantAuthentication tenant, + String token, DateRangeSearchCriteria searchCriteria) throws SiteWhereException; /** * Create command response event for assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return * @throws SiteWhereException */ - public DeviceCommandResponseWithAsset createCommandResponseForDeviceAssignment(ITenantAuthentication tenant, - String token, DeviceCommandResponseCreateRequest request) throws SiteWhereException; + DeviceCommandResponseWithAsset createCommandResponseForDeviceAssignment(ITenantAuthentication tenant, String token, + DeviceCommandResponseCreateRequest request) throws SiteWhereException; /** * List state change events for assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param token * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listStateChangesForDeviceAssignment(ITenantAuthentication tenant, + SearchResults listStateChangesForDeviceAssignment(ITenantAuthentication tenant, String token, DateRangeSearchCriteria searchCriteria) throws SiteWhereException; /** * Create state change event for assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return * @throws SiteWhereException */ - public DeviceStateChangeWithAsset createStateChangeForDeviceAssignment(ITenantAuthentication tenant, String token, + DeviceStateChangeWithAsset createStateChangeForDeviceAssignment(ITenantAuthentication tenant, String token, DeviceStateChangeCreateRequest request) throws SiteWhereException; /** * List alert events for device assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public SearchResults bulkListAlertsForDeviceAssignments(ITenantAuthentication tenant, + SearchResults bulkListAlertsForDeviceAssignments(ITenantAuthentication tenant, DeviceAssignmentBulkRequest request) throws SiteWhereException; /** * List command invocation events for assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public SearchResults bulkListCommandInvocationsForDeviceAssignments( - ITenantAuthentication tenant, DeviceAssignmentBulkRequest request) throws SiteWhereException; + SearchResults bulkListCommandInvocationsForDeviceAssignments(ITenantAuthentication tenant, + DeviceAssignmentBulkRequest request) throws SiteWhereException; /** * List location events for device assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public SearchResults bulkListLocationsForDeviceAssignments(ITenantAuthentication tenant, + SearchResults bulkListLocationsForDeviceAssignments(ITenantAuthentication tenant, DeviceAssignmentBulkRequest request) throws SiteWhereException; /** * List measurement events for multiple assignments. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public SearchResults bulkListMeasurementsForDeviceAssignments( - ITenantAuthentication tenant, DeviceAssignmentBulkRequest request) throws SiteWhereException; + SearchResults bulkListMeasurementsForDeviceAssignments(ITenantAuthentication tenant, + DeviceAssignmentBulkRequest request) throws SiteWhereException; /** * List measurements for multiple assignments as chart series. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public Map>> bulkListMeasurementsForDeviceAssignmentsAsChartSeries( + Map>> bulkListMeasurementsForDeviceAssignmentsAsChartSeries( ITenantAuthentication tenant, DeviceAssignmentBulkRequest request) throws SiteWhereException; /** * List command response events for assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public SearchResults bulkListCommandResponsesForDeviceAssignments( + SearchResults bulkListCommandResponsesForDeviceAssignments( ITenantAuthentication tenant, DeviceAssignmentBulkRequest request) throws SiteWhereException; /** * List state change events for a device assignment. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public SearchResults bulkListStateChangesForDeviceAssignments( - ITenantAuthentication tenant, DeviceAssignmentBulkRequest request) throws SiteWhereException; + SearchResults bulkListStateChangesForDeviceAssignments(ITenantAuthentication tenant, + DeviceAssignmentBulkRequest request) throws SiteWhereException; // ------------------------------------------------------------------------ // Authorities @@ -858,38 +978,43 @@ public SearchResults bulkListStateChangesForDeviceAs * @return * @throws SiteWhereException */ - public SearchResults listAuthorities(ITenantAuthentication tenant) throws SiteWhereException; + SearchResults listAuthorities(ITenantAuthentication tenant) throws SiteWhereException; /** * Get authority by name. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param name * @return * @throws SiteWhereException */ - public GrantedAuthority getAuthorityByName(ITenantAuthentication tenant, String name) throws SiteWhereException; + GrantedAuthority getAuthorityByName(ITenantAuthentication tenant, String name) throws SiteWhereException; /** * Create a new authority. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public GrantedAuthority createAuthority(ITenantAuthentication tenant, GrantedAuthorityCreateRequest request) + GrantedAuthority createAuthority(ITenantAuthentication tenant, GrantedAuthorityCreateRequest request) throws SiteWhereException; /** * Get authorities hierarchy. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @return * @throws SiteWhereException */ - public List getAuthoritiesHierarchy(ITenantAuthentication tenant) - throws SiteWhereException; + List getAuthoritiesHierarchy(ITenantAuthentication tenant) throws SiteWhereException; // ------------------------------------------------------------------------ // Batch Operations @@ -898,55 +1023,64 @@ public List getAuthoritiesHierarchy(ITenantAuthen /** * List batch operations. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listBatchOperations(ITenantAuthentication tenant, + SearchResults listBatchOperations(ITenantAuthentication tenant, BatchOperationSearchCriteria searchCriteria) throws SiteWhereException; /** * Get a batch operation by token. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param batchToken * @return * @throws SiteWhereException */ - public BatchOperation getBatchOperationByToken(ITenantAuthentication tenant, String batchToken) - throws SiteWhereException; + BatchOperation getBatchOperationByToken(ITenantAuthentication tenant, String batchToken) throws SiteWhereException; /** * List batch operation elements. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param operationToken * @return */ - public SearchResults listBatchOperationElements(ITenantAuthentication tenant, String operationToken) + SearchResults listBatchOperationElements(ITenantAuthentication tenant, String operationToken) throws SiteWhereException; /** * Create new batch command invocation. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public BatchOperation createBatchCommandInvocation(ITenantAuthentication tenant, - BatchCommandInvocationRequest request) throws SiteWhereException; + BatchOperation createBatchCommandInvocation(ITenantAuthentication tenant, BatchCommandInvocationRequest request) + throws SiteWhereException; /** * Create batch command operation based on criteria. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public Object createBatchCommandOperationForCriteria(ITenantAuthentication tenant, + Object createBatchCommandOperationForCriteria(ITenantAuthentication tenant, InvocationByDeviceCriteriaRequest request) throws SiteWhereException; // ------------------------------------------------------------------------ @@ -956,34 +1090,40 @@ public Object createBatchCommandOperationForCriteria(ITenantAuthentication tenan /** * Get command invocation by unique id. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param id * @return * @throws SiteWhereException */ - public DeviceCommandInvocation getDeviceCommandInvocation(ITenantAuthentication tenant, String id) + DeviceCommandInvocation getDeviceCommandInvocation(ITenantAuthentication tenant, String id) throws SiteWhereException; /** * Get command invocation summary. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param id * @return * @throws SiteWhereException */ - public DeviceCommandInvocationSummary getDeviceCommandInvocationSummary(ITenantAuthentication tenant, String id) + DeviceCommandInvocationSummary getDeviceCommandInvocationSummary(ITenantAuthentication tenant, String id) throws SiteWhereException; /** * List responses for command invocation. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param id * @return * @throws SiteWhereException */ - public SearchResults listCommandResponsesForCommandInvocation(ITenantAuthentication tenant, + SearchResults listCommandResponsesForCommandInvocation(ITenantAuthentication tenant, String id) throws SiteWhereException; // ------------------------------------------------------------------------ @@ -993,71 +1133,82 @@ public SearchResults listCommandResponsesForCommandInvoca /** * List customer types matching criteria. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return * @throws SiteWhereException */ - public SearchResults listCustomerTypes(ITenantAuthentication tenant, + SearchResults listCustomerTypes(ITenantAuthentication tenant, CustomerTypeSearchCriteria searchCriteria, CustomerTypeResponseFormat responseFormat) throws SiteWhereException; /** * Get a customer type by token. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param customerTypeToken * @return * @throws SiteWhereException */ - public CustomerType getCustomerTypeByToken(ITenantAuthentication tenant, String customerTypeToken) + CustomerType getCustomerTypeByToken(ITenantAuthentication tenant, String customerTypeToken) throws SiteWhereException; /** * Create a new customer type. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public CustomerType createCustomerType(ITenantAuthentication tenant, CustomerTypeCreateRequest request) + CustomerType createCustomerType(ITenantAuthentication tenant, CustomerTypeCreateRequest request) throws SiteWhereException; /** * Update an existing customer type. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param customerTypeToken * @param request * @return * @throws SiteWhereException */ - public CustomerType updateCustomerType(ITenantAuthentication tenant, String customerTypeToken, + CustomerType updateCustomerType(ITenantAuthentication tenant, String customerTypeToken, CustomerTypeCreateRequest request) throws SiteWhereException; /** * Delete an existing customer type. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param customerTypeToken * @return * @throws SiteWhereException */ - public CustomerType deleteCustomerType(ITenantAuthentication tenant, String customerTypeToken) - throws SiteWhereException; + CustomerType deleteCustomerType(ITenantAuthentication tenant, String customerTypeToken) throws SiteWhereException; /** * Get label for customer type. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param customerTypeToken * @param generatorId * @return * @throws SiteWhereException */ - public byte[] getLabelForCustomerType(ITenantAuthentication tenant, String customerTypeToken, String generatorId) + byte[] getLabelForCustomerType(ITenantAuthentication tenant, String customerTypeToken, String generatorId) throws SiteWhereException; // ------------------------------------------------------------------------ @@ -1067,164 +1218,190 @@ public byte[] getLabelForCustomerType(ITenantAuthentication tenant, String custo /** * List customers matching criteria. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return * @throws SiteWhereException */ - public SearchResults listCustomers(ITenantAuthentication tenant, CustomerSearchCriteria searchCriteria, + SearchResults listCustomers(ITenantAuthentication tenant, CustomerSearchCriteria searchCriteria, CustomerResponseFormat responseFormat) throws SiteWhereException; /** * Get a customer by token. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param customerToken * @return * @throws SiteWhereException */ - public MarshaledCustomer getCustomerByToken(ITenantAuthentication tenant, String customerToken) - throws SiteWhereException; + MarshaledCustomer getCustomerByToken(ITenantAuthentication tenant, String customerToken) throws SiteWhereException; /** * Create a new customer. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public Customer createCustomer(ITenantAuthentication tenant, CustomerCreateRequest request) - throws SiteWhereException; + Customer createCustomer(ITenantAuthentication tenant, CustomerCreateRequest request) throws SiteWhereException; /** * Update an existing customer. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param customerToken * @param request * @return * @throws SiteWhereException */ - public Customer updateCustomer(ITenantAuthentication tenant, String customerToken, CustomerCreateRequest request) + Customer updateCustomer(ITenantAuthentication tenant, String customerToken, CustomerCreateRequest request) throws SiteWhereException; /** * Delete an existing customer. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param customerToken * @return * @throws SiteWhereException */ - public Customer deleteCustomer(ITenantAuthentication tenant, String customerToken) throws SiteWhereException; + Customer deleteCustomer(ITenantAuthentication tenant, String customerToken) throws SiteWhereException; /** * List alerts for a customer. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param customerToken * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listAlertsForCustomer(ITenantAuthentication tenant, String customerToken, + SearchResults listAlertsForCustomer(ITenantAuthentication tenant, String customerToken, DateRangeSearchCriteria searchCriteria) throws SiteWhereException; /** * List device assignments for a customer. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param customerToken * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listDeviceAssignmentsForCustomer(ITenantAuthentication tenant, + SearchResults listDeviceAssignmentsForCustomer(ITenantAuthentication tenant, String customerToken, DeviceAssignmentSearchCriteria searchCriteria, DeviceAssignmentResponseFormat responseFormat) throws SiteWhereException; /** * List command invocations for a customer. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param customerToken * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listCommandInvocationsForCustomer(ITenantAuthentication tenant, + SearchResults listCommandInvocationsForCustomer(ITenantAuthentication tenant, String customerToken, DateRangeSearchCriteria searchCriteria) throws SiteWhereException; /** * Get label for customer. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param customerTypeToken * @param generatorId * @return * @throws SiteWhereException */ - public byte[] getLabelForCustomer(ITenantAuthentication tenant, String customerTypeToken, String generatorId) + byte[] getLabelForCustomer(ITenantAuthentication tenant, String customerTypeToken, String generatorId) throws SiteWhereException; /** * List locations for a customer. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param customerToken * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listLocationsForCustomer(ITenantAuthentication tenant, - String customerToken, DateRangeSearchCriteria searchCriteria) throws SiteWhereException; + SearchResults listLocationsForCustomer(ITenantAuthentication tenant, String customerToken, + DateRangeSearchCriteria searchCriteria) throws SiteWhereException; /** * List locations for a customer. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param customerToken * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listMeasurementsForCustomer(ITenantAuthentication tenant, + SearchResults listMeasurementsForCustomer(ITenantAuthentication tenant, String customerToken, DateRangeSearchCriteria searchCriteria) throws SiteWhereException; /** * List command responses for a customer. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param customerToken * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listCommandResponsesForCustomer(ITenantAuthentication tenant, + SearchResults listCommandResponsesForCustomer(ITenantAuthentication tenant, String customerToken, DateRangeSearchCriteria searchCriteria) throws SiteWhereException; /** * List state changes for a customer. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param customerToken * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listStateChangesForCustomer(ITenantAuthentication tenant, + SearchResults listStateChangesForCustomer(ITenantAuthentication tenant, String customerToken, DateRangeSearchCriteria searchCriteria) throws SiteWhereException; /** * List all customer in tree format. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @return * @throws SiteWhereException */ - public List customerTree(ITenantAuthentication tenant) throws SiteWhereException; + List customerTree(ITenantAuthentication tenant) throws SiteWhereException; // ------------------------------------------------------------------------ // Device Commands @@ -1233,68 +1410,80 @@ public SearchResults listStateChangesForCustomer(ITe /** * List device commands matching criteria. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return * @throws SiteWhereException */ - public SearchResults listDeviceCommands(ITenantAuthentication tenant, + SearchResults listDeviceCommands(ITenantAuthentication tenant, DeviceCommandSearchCriteria searchCriteria) throws SiteWhereException; /** * Get a device command by token. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException */ - public DeviceCommand getDeviceCommandByToken(ITenantAuthentication tenant, String token) throws SiteWhereException; + DeviceCommand getDeviceCommandByToken(ITenantAuthentication tenant, String token) throws SiteWhereException; /** * Create a new device command. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public DeviceCommand createDeviceCommand(ITenantAuthentication tenant, DeviceCommandCreateRequest request) + DeviceCommand createDeviceCommand(ITenantAuthentication tenant, DeviceCommandCreateRequest request) throws SiteWhereException; /** * Update an existing device command. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return * @throws SiteWhereException */ - public DeviceCommand updateDeviceCommand(ITenantAuthentication tenant, String token, - DeviceCommandCreateRequest request) throws SiteWhereException; + DeviceCommand updateDeviceCommand(ITenantAuthentication tenant, String token, DeviceCommandCreateRequest request) + throws SiteWhereException; /** * Delete an existing device command. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException */ - public DeviceCommand deleteDeviceCommand(ITenantAuthentication tenant, String token) throws SiteWhereException; + DeviceCommand deleteDeviceCommand(ITenantAuthentication tenant, String token) throws SiteWhereException; /** * List device commands by namespace. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return * @throws SiteWhereException */ - public SearchResults listDeviceCommandsByNamesapce(ITenantAuthentication tenant, + SearchResults listDeviceCommandsByNamesapce(ITenantAuthentication tenant, DeviceCommandSearchCriteria searchCriteria) throws SiteWhereException; // ------------------------------------------------------------------------ @@ -1304,24 +1493,27 @@ public SearchResults listDeviceCommandsByNamesapce(ITena /** * Get a device event by alternate Id. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param alternateId * @return * @throws SiteWhereException */ - public DeviceEventWithAsset getDeviceEventByAlternateId(ITenantAuthentication tenant, String alternateId) + DeviceEventWithAsset getDeviceEventByAlternateId(ITenantAuthentication tenant, String alternateId) throws SiteWhereException; /** * Get a device event by Id. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param eventId * @return * @throws SiteWhereException */ - public DeviceEventWithAsset getDeviceEventById(ITenantAuthentication tenant, String eventId) - throws SiteWhereException; + DeviceEventWithAsset getDeviceEventById(ITenantAuthentication tenant, String eventId) throws SiteWhereException; // ------------------------------------------------------------------------ // Device Groups @@ -1330,117 +1522,137 @@ public DeviceEventWithAsset getDeviceEventById(ITenantAuthentication tenant, Str /** * List device groups matching criteria. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return * @throws SiteWhereException */ - public SearchResults listDeviceGroups(ITenantAuthentication tenant, - DeviceGroupSearchCriteria searchCriteria) throws SiteWhereException; + SearchResults listDeviceGroups(ITenantAuthentication tenant, DeviceGroupSearchCriteria searchCriteria) + throws SiteWhereException; /** * Get a device group by token. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param groupToken * @return * @throws SiteWhereException */ - public DeviceGroup getDeviceGroupByToken(ITenantAuthentication tenant, String groupToken) throws SiteWhereException; + DeviceGroup getDeviceGroupByToken(ITenantAuthentication tenant, String groupToken) throws SiteWhereException; /** * Create a new device group. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public DeviceGroup createDeviceGroup(ITenantAuthentication tenant, DeviceGroupCreateRequest request) + DeviceGroup createDeviceGroup(ITenantAuthentication tenant, DeviceGroupCreateRequest request) throws SiteWhereException; /** * Update an existing device group. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param groupToken * @param request * @return * @throws SiteWhereException */ - public DeviceGroup updateDeviceGroup(ITenantAuthentication tenant, String groupToken, - DeviceGroupCreateRequest request) throws SiteWhereException; + DeviceGroup updateDeviceGroup(ITenantAuthentication tenant, String groupToken, DeviceGroupCreateRequest request) + throws SiteWhereException; /** * Delete an existing device group. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param groupToken * @return * @throws SiteWhereException */ - public DeviceGroup deleteDeviceGroup(ITenantAuthentication tenant, String groupToken) throws SiteWhereException; + DeviceGroup deleteDeviceGroup(ITenantAuthentication tenant, String groupToken) throws SiteWhereException; /** * List elements in a device group. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return * @throws SiteWhereException */ - public SearchResults listDeviceGroupElements(ITenantAuthentication tenant, + SearchResults listDeviceGroupElements(ITenantAuthentication tenant, DeviceGroupElementSearchCriteria searchCriteria, DeviceGroupElementResponseFormat responseFormat) throws SiteWhereException; /** * Add elements to device group. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param groupToken * @param requests * @return * @throws SiteWhereException */ - public SearchResults addElementsToDdeviceGroup(ITenantAuthentication tenant, String groupToken, + SearchResults addElementsToDdeviceGroup(ITenantAuthentication tenant, String groupToken, List requests) throws SiteWhereException; /** * Delete elements from device group. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param groupToken * @param elementIds * @return * @throws SiteWhereException */ - public SearchResults deleteDeviceGroupElements(ITenantAuthentication tenant, String groupToken, + SearchResults deleteDeviceGroupElements(ITenantAuthentication tenant, String groupToken, List elementIds) throws SiteWhereException; /** * Delete elements from device group. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param groupToken * @param elementId * @return * @throws SiteWhereException */ - public SearchResults deleteDeviceGroupElement(ITenantAuthentication tenant, String groupToken, + SearchResults deleteDeviceGroupElement(ITenantAuthentication tenant, String groupToken, String elementId) throws SiteWhereException; /** * Get label for device group. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param groupToken * @param generatorId * @return * @throws SiteWhereException */ - public byte[] getLabelForDeviceGroup(ITenantAuthentication tenant, String groupToken, String generatorId) + byte[] getLabelForDeviceGroup(ITenantAuthentication tenant, String groupToken, String generatorId) throws SiteWhereException; // ------------------------------------------------------------------------ @@ -1450,15 +1662,16 @@ public byte[] getLabelForDeviceGroup(ITenantAuthentication tenant, String groupT /** * List device states matching criteria. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return * @throws SiteWhereException */ - public SearchResults listDeviceStates(ITenantAuthentication tenant, - DeviceStateSearchCriteria searchCriteria, DeviceStateResponseFormat responseFormat) - throws SiteWhereException; + SearchResults listDeviceStates(ITenantAuthentication tenant, DeviceStateSearchCriteria searchCriteria, + DeviceStateResponseFormat responseFormat) throws SiteWhereException; // ------------------------------------------------------------------------ // Device Statuses @@ -1467,57 +1680,67 @@ public SearchResults listDeviceStates(ITenantAuthentication tenant, /** * List device statuses that match criteria.. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return * @throws SiteWhereException */ - public SearchResults listDeviceStatuses(ITenantAuthentication tenant, + SearchResults listDeviceStatuses(ITenantAuthentication tenant, DeviceStatusSearchCriteria searchCriteria) throws SiteWhereException; /** * Get a device status by token. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException */ - public DeviceStatus getDeviceStatusByToken(ITenantAuthentication tenant, String token) throws SiteWhereException; + DeviceStatus getDeviceStatusByToken(ITenantAuthentication tenant, String token) throws SiteWhereException; /** * Create a new device status. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public DeviceStatus createDeviceStatus(ITenantAuthentication tenant, DeviceStatusCreateRequest request) + DeviceStatus createDeviceStatus(ITenantAuthentication tenant, DeviceStatusCreateRequest request) throws SiteWhereException; /** * Update an existing device status. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return * @throws SiteWhereException */ - public DeviceStatus updateDeviceStatus(ITenantAuthentication tenant, String token, - DeviceStatusCreateRequest request) throws SiteWhereException; + DeviceStatus updateDeviceStatus(ITenantAuthentication tenant, String token, DeviceStatusCreateRequest request) + throws SiteWhereException; /** * Delete an existing device status. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException */ - public DeviceStatus deleteDeviceStatus(ITenantAuthentication tenant, String token) throws SiteWhereException; + DeviceStatus deleteDeviceStatus(ITenantAuthentication tenant, String token) throws SiteWhereException; // ------------------------------------------------------------------------ // Device Types @@ -1526,90 +1749,105 @@ public DeviceStatus updateDeviceStatus(ITenantAuthentication tenant, String toke /** * List device types that match criteria.. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return * @throws SiteWhereException */ - public SearchResults listDeviceTypes(ITenantAuthentication tenant, - DeviceTypeSearchCriteria searchCriteria, DeviceTypeResponseFormat responseFormat) throws SiteWhereException; + SearchResults listDeviceTypes(ITenantAuthentication tenant, DeviceTypeSearchCriteria searchCriteria, + DeviceTypeResponseFormat responseFormat) throws SiteWhereException; /** * Get a device type by token. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException */ - public DeviceType getDeviceTypeByToken(ITenantAuthentication tenant, String token) throws SiteWhereException; + DeviceType getDeviceTypeByToken(ITenantAuthentication tenant, String token) throws SiteWhereException; /** * Create a new device type. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public DeviceType createDeviceType(ITenantAuthentication tenant, DeviceTypeCreateRequest request) + DeviceType createDeviceType(ITenantAuthentication tenant, DeviceTypeCreateRequest request) throws SiteWhereException; /** * Update an existing device type. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return * @throws SiteWhereException */ - public DeviceType updateDeviceType(ITenantAuthentication tenant, String token, DeviceTypeCreateRequest request) + DeviceType updateDeviceType(ITenantAuthentication tenant, String token, DeviceTypeCreateRequest request) throws SiteWhereException; /** * Delete an existing device type. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException */ - public DeviceType deleteDeviceType(ITenantAuthentication tenant, String token) throws SiteWhereException; + DeviceType deleteDeviceType(ITenantAuthentication tenant, String token) throws SiteWhereException; /** * Get label for device type. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param token * @param generatorId * @return * @throws SiteWhereException */ - public byte[] getLabelForDeviceType(ITenantAuthentication tenant, String token, String generatorId) + byte[] getLabelForDeviceType(ITenantAuthentication tenant, String token, String generatorId) throws SiteWhereException; /** * Get device type specification GPB by unique token. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException */ - public String getDeviceTypeGPBSpecification(ITenantAuthentication tenant, String token) throws SiteWhereException; + String getDeviceTypeGPBSpecification(ITenantAuthentication tenant, String token) throws SiteWhereException; /** * Download device type specification GPB by unique token. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException */ - public File downlaodDeviceTypeGPBSpecification(ITenantAuthentication tenant, String token) - throws SiteWhereException; + File downlaodDeviceTypeGPBSpecification(ITenantAuthentication tenant, String token) throws SiteWhereException; // ------------------------------------------------------------------------ // Devices @@ -1618,144 +1856,167 @@ public File downlaodDeviceTypeGPBSpecification(ITenantAuthentication tenant, Str /** * List devices that match criteria.. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return * @throws SiteWhereException */ - public SearchResults listDevices(ITenantAuthentication tenant, DeviceSearchCriteria searchCriteria, + SearchResults listDevices(ITenantAuthentication tenant, DeviceSearchCriteria searchCriteria, DeviceResponseFormat responseFormat) throws SiteWhereException; /** * Get a device by token. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param deviceToken * @return * @throws SiteWhereException */ - public MarshaledDevice getDeviceByToken(ITenantAuthentication tenant, String deviceToken) throws SiteWhereException; + MarshaledDevice getDeviceByToken(ITenantAuthentication tenant, String deviceToken) throws SiteWhereException; /** * Create a new device. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public MarshaledDevice createDevice(ITenantAuthentication tenant, DeviceCreateRequest request) - throws SiteWhereException; + MarshaledDevice createDevice(ITenantAuthentication tenant, DeviceCreateRequest request) throws SiteWhereException; /** * Update an existing device. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param deviceToken * @param request * @return * @throws SiteWhereException */ - public MarshaledDevice updateDevice(ITenantAuthentication tenant, String deviceToken, DeviceCreateRequest request) + MarshaledDevice updateDevice(ITenantAuthentication tenant, String deviceToken, DeviceCreateRequest request) throws SiteWhereException; /** * Delete an existing device. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param deviceToken * @return * @throws SiteWhereException */ - public MarshaledDevice deleteDevice(ITenantAuthentication tenant, String deviceToken) throws SiteWhereException; + MarshaledDevice deleteDevice(ITenantAuthentication tenant, String deviceToken) throws SiteWhereException; /** * List assignment history for device. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param deviceToken * @param searchCriteria * @param responseFormat * @return * @throws SiteWhereException */ - public SearchResults listDeviceAssignmentsForDevice(ITenantAuthentication tenant, + SearchResults listDeviceAssignmentsForDevice(ITenantAuthentication tenant, String deviceToken, DeviceAssignmentSearchCriteria searchCriteria, DeviceAssignmentResponseFormat responseFormat) throws SiteWhereException; /** * Add multiple events for device. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param deviceToken * @param batch * @return * @throws SiteWhereException */ - public DeviceEventBatchResponse addMultipleEventsForDevice(ITenantAuthentication tenant, String deviceToken, + DeviceEventBatchResponse addMultipleEventsForDevice(ITenantAuthentication tenant, String deviceToken, DeviceEventBatch batch) throws SiteWhereException; /** * Get label for device. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param deviceToken * @param generatorId * @return * @throws SiteWhereException */ - public byte[] getLabelForDevice(ITenantAuthentication tenant, String deviceToken, String generatorId) + byte[] getLabelForDevice(ITenantAuthentication tenant, String deviceToken, String generatorId) throws SiteWhereException; /** * Create new device element mapping. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param deviceToken * @param request * @return * @throws SiteWhereException */ - public MarshaledDevice createDeviceMappings(ITenantAuthentication tenant, String deviceToken, - DeviceElementMapping request) throws SiteWhereException; + MarshaledDevice createDeviceMappings(ITenantAuthentication tenant, String deviceToken, DeviceElementMapping request) + throws SiteWhereException; /** * Delete existing device element mapping. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param deviceToken * @param path * @return * @throws SiteWhereException */ - public MarshaledDevice deleteDeviceMappings(ITenantAuthentication tenant, String deviceToken, String path) + MarshaledDevice deleteDeviceMappings(ITenantAuthentication tenant, String deviceToken, String path) throws SiteWhereException; /** * List devices in device group. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param groupToken * @param searchCriteria * @param responseFormat * @return * @throws SiteWhereException */ - public SearchResults listDevicesByDeviceGroup(ITenantAuthentication tenant, String groupToken, + SearchResults listDevicesByDeviceGroup(ITenantAuthentication tenant, String groupToken, DeviceSearchCriteria searchCriteria, DeviceByGroupResponseFormat responseFormat) throws SiteWhereException; /** * List devices in device group with role. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param role * @param searchCriteria * @param responseFormat * @return * @throws SiteWhereException */ - public SearchResults listDevicesByDeviceGroupWithRole(ITenantAuthentication tenant, String role, + SearchResults listDevicesByDeviceGroupWithRole(ITenantAuthentication tenant, String role, DeviceSearchCriteria searchCriteria, DeviceByGroupResponseFormat responseFormat) throws SiteWhereException; // ------------------------------------------------------------------------ @@ -1773,58 +2034,68 @@ public SearchResults listDevicesByDeviceGroupWithRole(ITenantAuthenticat /** * List scheduled jobs matching criteria. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return * @throws SiteWhereException */ - public SearchResults listScheduledJobs(ITenantAuthentication tenant, + SearchResults listScheduledJobs(ITenantAuthentication tenant, ScheduledJobSearchCriteria searchCriteria, ScheduledJobResponseFormat responseFormat) throws SiteWhereException; /** * Get a schedule job by token. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException */ - public ScheduledJob getScheduledJobByToken(ITenantAuthentication tenant, String token) throws SiteWhereException; + ScheduledJob getScheduledJobByToken(ITenantAuthentication tenant, String token) throws SiteWhereException; /** * Create a new schedule job. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public ScheduledJob createScheduledJob(ITenantAuthentication tenant, ScheduledJobCreateRequest request) + ScheduledJob createScheduledJob(ITenantAuthentication tenant, ScheduledJobCreateRequest request) throws SiteWhereException; /** * Update an existing schedule job. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return * @throws SiteWhereException */ - public ScheduledJob updateScheduledJob(ITenantAuthentication tenant, String token, - ScheduledJobCreateRequest request) throws SiteWhereException; + ScheduledJob updateScheduledJob(ITenantAuthentication tenant, String token, ScheduledJobCreateRequest request) + throws SiteWhereException; /** * Delete an existing schedule job. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException */ - public ScheduledJob deleteScheduledJob(ITenantAuthentication tenant, String token) throws SiteWhereException; + ScheduledJob deleteScheduledJob(ITenantAuthentication tenant, String token) throws SiteWhereException; // ------------------------------------------------------------------------ // Schedules @@ -1833,57 +2104,65 @@ public ScheduledJob updateScheduledJob(ITenantAuthentication tenant, String toke /** * List schedules matching criteria. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return * @throws SiteWhereException */ - public SearchResults listSchedules(ITenantAuthentication tenant, ScheduleSearchCriteria searchCriteria, + SearchResults listSchedules(ITenantAuthentication tenant, ScheduleSearchCriteria searchCriteria, ScheduleResponseFormat responseFormat) throws SiteWhereException; /** * Get a schedule by token. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException */ - public Schedule getScheduleByToken(ITenantAuthentication tenant, String token) throws SiteWhereException; + Schedule getScheduleByToken(ITenantAuthentication tenant, String token) throws SiteWhereException; /** * Create a new schedule. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException */ - public Schedule createSchedule(ITenantAuthentication tenant, ScheduleCreateRequest request) - throws SiteWhereException; + Schedule createSchedule(ITenantAuthentication tenant, ScheduleCreateRequest request) throws SiteWhereException; /** * Update an existing schedule. * - * @param tenant Tenant authentication information. Tenant authentication information. + * @param tenant + * Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return * @throws SiteWhereException */ - public Schedule updateSchedule(ITenantAuthentication tenant, String token, ScheduleCreateRequest request) + Schedule updateSchedule(ITenantAuthentication tenant, String token, ScheduleCreateRequest request) throws SiteWhereException; /** * Delete an existing schedule. * - * @param tenant Tenant authentication information. + * @param tenant + * Tenant authentication information. * @param token * @return * @throws SiteWhereException */ - public Schedule deleteSchedule(ITenantAuthentication tenant, String token) throws SiteWhereException; + Schedule deleteSchedule(ITenantAuthentication tenant, String token) throws SiteWhereException; // ------------------------------------------------------------------------ // System @@ -1895,7 +2174,7 @@ public Schedule updateSchedule(ITenantAuthentication tenant, String token, Sched * @return * @throws SiteWhereException */ - public Version getSiteWhereVersion() throws SiteWhereException; + Version getSiteWhereVersion() throws SiteWhereException; // ------------------------------------------------------------------------ // Tenants @@ -1908,16 +2187,17 @@ public Schedule updateSchedule(ITenantAuthentication tenant, String token, Sched * @return * @throws SiteWhereException */ - public SearchResults listTenants(TenantSearchCriteria searchCriteria) throws SiteWhereException; + SearchResults listTenants(TenantSearchCriteria searchCriteria) throws SiteWhereException; /** * Get a tenant by token. * - * @param tenant Tenant authentication information.Token + * @param tenant + * Tenant authentication information.Token * @return * @throws SiteWhereException */ - public Tenant getTenantByToken(String tenantToken) throws SiteWhereException; + Tenant getTenantByToken(String tenantToken) throws SiteWhereException; /** * Create a new tenant. @@ -1926,26 +2206,28 @@ public Schedule updateSchedule(ITenantAuthentication tenant, String token, Sched * @return * @throws SiteWhereException */ - public Tenant createTenant(TenantCreateRequest request) throws SiteWhereException; + Tenant createTenant(TenantCreateRequest request) throws SiteWhereException; /** * Update an existing tenant. * - * @param tenant Tenant authentication information.Token + * @param tenant + * Tenant authentication information.Token * @param request * @return * @throws SiteWhereException */ - public Tenant updateTenant(String tenantToken, TenantCreateRequest request) throws SiteWhereException; + Tenant updateTenant(String tenantToken, TenantCreateRequest request) throws SiteWhereException; /** * Delete an existing tenant. * - * @param tenant Tenant authentication information.Token + * @param tenant + * Tenant authentication information.Token * @return * @throws SiteWhereException */ - public Tenant deleteTenant(String tenantToken) throws SiteWhereException; + Tenant deleteTenant(String tenantToken) throws SiteWhereException; // ------------------------------------------------------------------------ // Users @@ -1954,62 +2236,68 @@ public Schedule updateSchedule(ITenantAuthentication tenant, String token, Sched /** * List users matching criteria. * - * @param tenant Tenant authentication information. + * @param tenant + * Tenant authentication information. * @return * @throws SiteWhereException */ - public SearchResults listUsers() throws SiteWhereException; + SearchResults listUsers() throws SiteWhereException; /** * Get a user by username. * - * @param tenant Tenant authentication information. + * @param tenant + * Tenant authentication information. * @param username * @return * @throws SiteWhereException */ - public User getUserByUsername(String username) throws SiteWhereException; + User getUserByUsername(String username) throws SiteWhereException; /** * Create a new user. * - * @param tenant Tenant authentication information. + * @param tenant + * Tenant authentication information. * @param request * @return * @throws SiteWhereException */ - public User createUser(UserCreateRequest request) throws SiteWhereException; + User createUser(UserCreateRequest request) throws SiteWhereException; /** * Update an existing user. * - * @param tenant Tenant authentication information. + * @param tenant + * Tenant authentication information. * @param username * @param request * @return * @throws SiteWhereException */ - public User updateUser(String username, UserCreateRequest request) throws SiteWhereException; + User updateUser(String username, UserCreateRequest request) throws SiteWhereException; /** * Delete an existing user. * - * @param tenant Tenant authentication information. + * @param tenant + * Tenant authentication information. * @param username * @return * @throws SiteWhereException */ - public User deleteUser(String username) throws SiteWhereException; + User deleteUser(String username) throws SiteWhereException; /** * Get authorities for user. * - * @param tenant Tenant authentication information. + * @param tenant + * Tenant authentication information. * @param username * @return * @throws SiteWhereException */ - public SearchResults listUserAuthorities(String username) throws SiteWhereException; + SearchResults listUserAuthorities(String username) throws SiteWhereException; // ------------------------------------------------------------------------ // Zones @@ -2018,54 +2306,58 @@ public Schedule updateSchedule(ITenantAuthentication tenant, String token, Sched /** * List zones matching criteria. * - * @param tenant Tenant authentication information. + * @param tenant + * Tenant authentication information. * @param searchCriteria * @return * @throws SiteWhereException */ - public SearchResults listZones(ITenantAuthentication tenant, ZoneSearchCriteria searchCriteria) + SearchResults listZones(ITenantAuthentication tenant, ZoneSearchCriteria searchCriteria) throws SiteWhereException; /** * Get a zone by token. * - * @param tenant Tenant authentication information. + * @param tenant + * Tenant authentication information. * @param zoneToken * @return * @throws SiteWhereException */ - public Zone getZoneByToken(ITenantAuthentication tenant, String zoneToken) throws SiteWhereException; + Zone getZoneByToken(ITenantAuthentication tenant, String zoneToken) throws SiteWhereException; /** * Create a new zone. * - * @param tenant Tenant authentication information. + * @param tenant + * Tenant authentication information. * @param request * @return * @throws SiteWhereException */ - public Zone createZone(ITenantAuthentication tenant, ZoneCreateRequest request) throws SiteWhereException; + Zone createZone(ITenantAuthentication tenant, ZoneCreateRequest request) throws SiteWhereException; /** * Update an existing zone. * - * @param tenant Tenant authentication information. + * @param tenant + * Tenant authentication information. * @param zoneToken * @param request * @return * @throws SiteWhereException */ - public Zone updateZone(ITenantAuthentication tenant, String zoneToken, ZoneCreateRequest request) + Zone updateZone(ITenantAuthentication tenant, String zoneToken, ZoneCreateRequest request) throws SiteWhereException; /** * Delete an existing zone. * - * @param tenant Tenant authentication information. + * @param tenant + * Tenant authentication information. * @param zoneToken * @return * @throws SiteWhereException */ - public Zone deleteZone(ITenantAuthentication tenant, String zoneToken) throws SiteWhereException; - + Zone deleteZone(ITenantAuthentication tenant, String zoneToken) throws SiteWhereException; } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IArea.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IArea.java index 2e8f4a1..35a3f54 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IArea.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IArea.java @@ -22,5 +22,5 @@ public interface IArea extends IBrandedTreeEntity, IBoundedEntity { * * @return */ - public UUID getAreaTypeId(); + UUID getAreaTypeId(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IBoundedEntity.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IBoundedEntity.java index 92db9a5..44f9142 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IBoundedEntity.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IBoundedEntity.java @@ -22,5 +22,5 @@ public interface IBoundedEntity { * * @return */ - public List getBounds(); + List getBounds(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IZone.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IZone.java index 7bb9197..2d1551b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IZone.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IZone.java @@ -21,40 +21,40 @@ public interface IZone extends IBoundedEntity, IPersistentEntity { * * @return */ - public UUID getAreaId(); + UUID getAreaId(); /** * Get display name. * * @return */ - public String getName(); + String getName(); /** * Get the border color. * * @return */ - public String getBorderColor(); + String getBorderColor(); /** * Get the border opacity value. * * @return */ - public Double getBorderOpacity(); + Double getBorderOpacity(); /** * Get the fill color. * * @return */ - public String getFillColor(); + String getFillColor(); /** * Get the fill opacity value. * * @return */ - public Double getFillOpacity(); + Double getFillOpacity(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IAreaCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IAreaCreateRequest.java index 019887f..eb5b67f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IAreaCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IAreaCreateRequest.java @@ -24,12 +24,12 @@ public interface IAreaCreateRequest extends IAccessible, IBrandedEntityCreateReq * * @return */ - public String getAreaTypeToken(); + String getAreaTypeToken(); /** * Get list of coordinates that defines the area bounds. * * @return */ - public List getBounds(); + List getBounds(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IAreaTypeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IAreaTypeCreateRequest.java index dbbdf67..8324df8 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IAreaTypeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IAreaTypeCreateRequest.java @@ -22,5 +22,5 @@ public interface IAreaTypeCreateRequest extends IAccessible, IBrandedEntityCreat * * @return */ - public List getContainedAreaTypeTokens(); + List getContainedAreaTypeTokens(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IZoneCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IZoneCreateRequest.java index 1686dbd..611593e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IZoneCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IZoneCreateRequest.java @@ -22,47 +22,47 @@ public interface IZoneCreateRequest extends IPersistentEntityCreateRequest { * * @return */ - public String getAreaToken(); + String getAreaToken(); /** * Get zone name. * * @return */ - public String getName(); + String getName(); /** * Get zone boundary locations. * * @return */ - public List getBounds(); + List getBounds(); /** * Get border color for UI. * * @return */ - public String getBorderColor(); + String getBorderColor(); /** * Get opacity for border. * * @return */ - public Double getBorderOpacity(); + Double getBorderOpacity(); /** * Get fill color for UI. * * @return */ - public String getFillColor(); + String getFillColor(); /** * Get opacity for fill. * * @return */ - public Double getFillOpacity(); + Double getFillOpacity(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/IAsset.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/IAsset.java index 6a12c60..7e23039 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/IAsset.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/IAsset.java @@ -21,12 +21,12 @@ public interface IAsset extends IBrandedEntity { * * @return */ - public UUID getAssetTypeId(); + UUID getAssetTypeId(); /** * Get asset name. * * @return */ - public String getName(); + String getName(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/IAssetType.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/IAssetType.java index 4b4692e..1440fd3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/IAssetType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/IAssetType.java @@ -20,5 +20,5 @@ public interface IAssetType extends IBrandedEntity, IAccessible { * * @return */ - public AssetCategory getAssetCategory(); + AssetCategory getAssetCategory(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/request/IAssetCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/request/IAssetCreateRequest.java index 2a2fc2b..3221309 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/request/IAssetCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/request/IAssetCreateRequest.java @@ -19,12 +19,12 @@ public interface IAssetCreateRequest extends IBrandedEntityCreateRequest { * * @return */ - public String getAssetTypeToken(); + String getAssetTypeToken(); /** * Get asset name. * * @return */ - public String getName(); + String getName(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/request/IAssetTypeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/request/IAssetTypeCreateRequest.java index 8cf0428..87ebcc0 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/request/IAssetTypeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/request/IAssetTypeCreateRequest.java @@ -21,5 +21,5 @@ public interface IAssetTypeCreateRequest extends IAccessible, IBrandedEntityCrea * * @return */ - public AssetCategory getAssetCategory(); + AssetCategory getAssetCategory(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/IBatchElement.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/IBatchElement.java index 82727a8..f4b1c41 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/IBatchElement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/IBatchElement.java @@ -23,33 +23,33 @@ public interface IBatchElement extends IMetadataProvider, Serializable { * * @return */ - public UUID getId(); + UUID getId(); /** * Get id for parent batch operation. * * @return */ - public UUID getBatchOperationId(); + UUID getBatchOperationId(); /** * Get id for associated device. * * @return */ - public UUID getDeviceId(); + UUID getDeviceId(); /** * Get processing status indicator. * * @return */ - public ElementProcessingStatus getProcessingStatus(); + ElementProcessingStatus getProcessingStatus(); /** * Get the date on which the element was processed. * * @return */ - public Date getProcessedDate(); + Date getProcessedDate(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/IBatchOperation.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/IBatchOperation.java index 81a3254..c371c0d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/IBatchOperation.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/IBatchOperation.java @@ -22,33 +22,33 @@ public interface IBatchOperation extends IPersistentEntity { * * @return */ - public String getOperationType(); + String getOperationType(); /** * Operation parameters. * * @return */ - public Map getParameters(); + Map getParameters(); /** * Get processing status for the batch operation. * * @return */ - public BatchOperationStatus getProcessingStatus(); + BatchOperationStatus getProcessingStatus(); /** * Get the date when processing of the operation started. * * @return */ - public Date getProcessingStartedDate(); + Date getProcessingStartedDate(); /** * Get the date when processing of the operation ended. * * @return */ - public Date getProcessingEndedDate(); + Date getProcessingEndedDate(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/kafka/IUnprocessedBatchElement.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/kafka/IUnprocessedBatchElement.java index 4a8f243..5cde5cc 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/kafka/IUnprocessedBatchElement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/kafka/IUnprocessedBatchElement.java @@ -19,5 +19,5 @@ public interface IUnprocessedBatchElement { * * @return */ - public IBatchElement getBatchElement(); + IBatchElement getBatchElement(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/kafka/IUnprocessedBatchOperation.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/kafka/IUnprocessedBatchOperation.java index 84546f1..ebb4ff5 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/kafka/IUnprocessedBatchOperation.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/kafka/IUnprocessedBatchOperation.java @@ -22,12 +22,12 @@ public interface IUnprocessedBatchOperation { * * @return */ - public IBatchOperation getBatchOperation(); + IBatchOperation getBatchOperation(); /** * Get list of tokens for devices to which operation will be applied. * * @return */ - public List getDeviceTokens(); + List getDeviceTokens(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchCommandInvocationRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchCommandInvocationRequest.java index 5aca32a..6721b57 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchCommandInvocationRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchCommandInvocationRequest.java @@ -29,26 +29,26 @@ public interface IBatchCommandInvocationRequest extends IPersistentEntityCreateR * * @return */ - public String getDeviceTypeToken(); + String getDeviceTypeToken(); /** * Get token for command to be executed. * * @return */ - public String getCommandToken(); + String getCommandToken(); /** * Get the list of parameter names mapped to values. * * @return */ - public Map getParameterValues(); + Map getParameterValues(); /** * Get the list of targeted device tokens. * * @return */ - public List getDeviceTokens(); + List getDeviceTokens(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchElementCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchElementCreateRequest.java index 88a2505..4e72138 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchElementCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchElementCreateRequest.java @@ -22,26 +22,26 @@ public interface IBatchElementCreateRequest { * * @return */ - public String getDeviceToken(); + String getDeviceToken(); /** * Get processing status indicator. * * @return */ - public ElementProcessingStatus getProcessingStatus(); + ElementProcessingStatus getProcessingStatus(); /** * Get date element was processed. * * @return */ - public Date getProcessedDate(); + Date getProcessedDate(); /** * Get metadata values. * * @return */ - public Map getMetadata(); + Map getMetadata(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchOperationCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchOperationCreateRequest.java index b458437..9ee6eee 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchOperationCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchOperationCreateRequest.java @@ -26,19 +26,19 @@ public interface IBatchOperationCreateRequest extends IPersistentEntityCreateReq * * @return */ - public String getOperationType(); + String getOperationType(); /** * Get operation parameters. * * @return */ - public Map getParameters(); + Map getParameters(); /** * Get list of device tokens for operation. * * @return */ - public List getDeviceTokens(); + List getDeviceTokens(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchOperationUpdateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchOperationUpdateRequest.java index b3f7161..fe3fece 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchOperationUpdateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchOperationUpdateRequest.java @@ -23,19 +23,19 @@ public interface IBatchOperationUpdateRequest extends IPersistentEntityCreateReq * * @return */ - public BatchOperationStatus getProcessingStatus(); + BatchOperationStatus getProcessingStatus(); /** * Get updated processing start date. * * @return */ - public Date getProcessingStartedDate(); + Date getProcessingStartedDate(); /** * Get updated processing end date. * * @return */ - public Date getProcessingEndedDate(); + Date getProcessingEndedDate(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IInvocationByAssignmentCriteriaRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IInvocationByAssignmentCriteriaRequest.java index f4fa79d..26c6bdf 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IInvocationByAssignmentCriteriaRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IInvocationByAssignmentCriteriaRequest.java @@ -24,21 +24,21 @@ public interface IInvocationByAssignmentCriteriaRequest extends IPersistentEntit * * @return */ - public String getDeviceTypeToken(); + String getDeviceTypeToken(); /** * Get token for command to be executed. * * @return */ - public String getCommandToken(); + String getCommandToken(); /** * Get the list of parameter names mapped to values. * * @return */ - public Map getParameterValues(); + Map getParameterValues(); /** * If set, only assignments associated with the given customers will be sent the @@ -46,7 +46,7 @@ public interface IInvocationByAssignmentCriteriaRequest extends IPersistentEntit * * @return */ - public List getCustomerTokens(); + List getCustomerTokens(); /** * If set, only assignments associated with the given areas will be sent the @@ -54,7 +54,7 @@ public interface IInvocationByAssignmentCriteriaRequest extends IPersistentEntit * * @return */ - public List getAreaTokens(); + List getAreaTokens(); /** * If set, only assignments associated with the given assets will be sent the @@ -62,5 +62,5 @@ public interface IInvocationByAssignmentCriteriaRequest extends IPersistentEntit * * @return */ - public List getAssetTokens(); + List getAssetTokens(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IInvocationByDeviceCriteriaRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IInvocationByDeviceCriteriaRequest.java index 01eb378..055867c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IInvocationByDeviceCriteriaRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IInvocationByDeviceCriteriaRequest.java @@ -23,19 +23,19 @@ public interface IInvocationByDeviceCriteriaRequest extends IPersistentEntityCre * * @return */ - public String getDeviceTypeToken(); + String getDeviceTypeToken(); /** * Get token for command to be executed. * * @return */ - public String getCommandToken(); + String getCommandToken(); /** * Get the list of parameter names mapped to values. * * @return */ - public Map getParameterValues(); + Map getParameterValues(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/command/ICommandResponse.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/command/ICommandResponse.java index c37b1e3..dc0455c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/command/ICommandResponse.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/command/ICommandResponse.java @@ -19,12 +19,12 @@ public interface ICommandResponse extends Serializable { * * @return */ - public CommandResult getResult(); + CommandResult getResult(); /** * Get a detail message for the result. * * @return */ - public String getMessage(); + String getMessage(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IAccessible.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IAccessible.java index eb5acc9..94658c3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IAccessible.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IAccessible.java @@ -17,12 +17,12 @@ public interface IAccessible { * * @return */ - public String getName(); + String getName(); /** * Get the group description. * * @return */ - public String getDescription(); + String getDescription(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IColorProvider.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IColorProvider.java index d28d58a..0be4805 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IColorProvider.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IColorProvider.java @@ -17,19 +17,19 @@ public interface IColorProvider { * * @return */ - public String getBackgroundColor(); + String getBackgroundColor(); /** * Foreground color for user interface. * * @return */ - public String getForegroundColor(); + String getForegroundColor(); /** * Border color for user interface. * * @return */ - public String getBorderColor(); + String getBorderColor(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IFilter.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IFilter.java index b2096fb..fe19f74 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IFilter.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IFilter.java @@ -18,5 +18,5 @@ public interface IFilter { * @param item * @return */ - public boolean isExcluded(T item); + boolean isExcluded(T item); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IIconProvider.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IIconProvider.java index 9edf82b..53cc92f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IIconProvider.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IIconProvider.java @@ -17,5 +17,5 @@ public interface IIconProvider { * * @return */ - public String getIcon(); + String getIcon(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IImageProvider.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IImageProvider.java index 1265eee..0cfa32e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IImageProvider.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IImageProvider.java @@ -17,5 +17,5 @@ public interface IImageProvider { * * @return */ - public String getImageUrl(); + String getImageUrl(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/ILocation.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/ILocation.java index f8d1fec..4a40ccb 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/ILocation.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/ILocation.java @@ -19,19 +19,19 @@ public interface ILocation extends Serializable { * * @return */ - public Double getLatitude(); + Double getLatitude(); /** * Get longitude measurement. * * @return */ - public Double getLongitude(); + Double getLongitude(); /** * Get elevation measurement. * * @return */ - public Double getElevation(); + Double getElevation(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IMetadataProvider.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IMetadataProvider.java index 713d92c..80c0748 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IMetadataProvider.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IMetadataProvider.java @@ -19,5 +19,5 @@ public interface IMetadataProvider { * * @return */ - public Map getMetadata(); + Map getMetadata(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IPersistentEntity.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IPersistentEntity.java index 1dfe67e..0330778 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IPersistentEntity.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IPersistentEntity.java @@ -21,40 +21,40 @@ public interface IPersistentEntity extends IMetadataProvider, Serializable { * * @return */ - public UUID getId(); + UUID getId(); /** * Get reference token. * * @return */ - public String getToken(); + String getToken(); /** * Get date when entity was created. * * @return */ - public Date getCreatedDate(); + Date getCreatedDate(); /** * Get username that created entity. * * @return */ - public String getCreatedBy(); + String getCreatedBy(); /** * Get date when entity was last updated. * * @return */ - public Date getUpdatedDate(); + Date getUpdatedDate(); /** * Get username that last updated entity. * * @return */ - public String getUpdatedBy(); + String getUpdatedBy(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/ITreeEntity.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/ITreeEntity.java index 850aafa..3ea2e16 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/ITreeEntity.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/ITreeEntity.java @@ -19,5 +19,5 @@ public interface ITreeEntity extends IAccessible { * * @return */ - public UUID getParentId(); + UUID getParentId(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/IPersistentEntityCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/IPersistentEntityCreateRequest.java index 81ba093..6c64700 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/IPersistentEntityCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/IPersistentEntityCreateRequest.java @@ -21,5 +21,5 @@ public interface IPersistentEntityCreateRequest extends Serializable, IMetadataP * * @return */ - public String getToken(); + String getToken(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/ITreeEntityCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/ITreeEntityCreateRequest.java index 0419102..4ab39ad 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/ITreeEntityCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/ITreeEntityCreateRequest.java @@ -17,5 +17,5 @@ public interface ITreeEntityCreateRequest { * * @return */ - public String getParentToken(); + String getParentToken(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/ICustomer.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/ICustomer.java index fcef120..b9ca24b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/ICustomer.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/ICustomer.java @@ -22,5 +22,5 @@ public interface ICustomer extends IBrandedTreeEntity { * * @return */ - public UUID getCustomerTypeId(); + UUID getCustomerTypeId(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/request/ICustomerCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/request/ICustomerCreateRequest.java index 427aebe..54de50b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/request/ICustomerCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/request/ICustomerCreateRequest.java @@ -21,5 +21,5 @@ public interface ICustomerCreateRequest extends IAccessible, IBrandedEntityCreat * * @return */ - public String getCustomerTypeToken(); + String getCustomerTypeToken(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/request/ICustomerTypeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/request/ICustomerTypeCreateRequest.java index e0ef064..acf5d24 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/request/ICustomerTypeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/request/ICustomerTypeCreateRequest.java @@ -22,5 +22,5 @@ public interface ICustomerTypeCreateRequest extends IAccessible, IBrandedEntityC * * @return */ - public List getContainedCustomerTypeTokens(); + List getContainedCustomerTypeTokens(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDevice.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDevice.java index 61d867f..38198fc 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDevice.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDevice.java @@ -23,14 +23,14 @@ public interface IDevice extends IPersistentEntity { * * @return */ - public UUID getDeviceTypeId(); + UUID getDeviceTypeId(); /** * If contained by a parent device, returns the parent device id. * * @return */ - public UUID getParentDeviceId(); + UUID getParentDeviceId(); /** * Gets mappings of {@link IDeviceElementSchema} paths to hardware ids for @@ -38,19 +38,19 @@ public interface IDevice extends IPersistentEntity { * * @return */ - public List getDeviceElementMappings(); + List getDeviceElementMappings(); /** * Get device comments. * * @return */ - public String getComments(); + String getComments(); /** * Get most recent device status. * * @return */ - public String getStatus(); + String getStatus(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAlarm.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAlarm.java index b372033..18ce15a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAlarm.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAlarm.java @@ -22,82 +22,82 @@ public interface IDeviceAlarm extends IMetadataProvider { * * @return */ - public UUID getId(); + UUID getId(); /** * Get device id. * * @return */ - public UUID getDeviceId(); + UUID getDeviceId(); /** * Get assignment id. * * @return */ - public UUID getDeviceAssignmentId(); + UUID getDeviceAssignmentId(); /** * Get customer id if assigned. * * @return */ - public UUID getCustomerId(); + UUID getCustomerId(); /** * Get area id if assigned. * * @return */ - public UUID getAreaId(); + UUID getAreaId(); /** * Get asset id if assigned. * * @return */ - public UUID getAssetId(); + UUID getAssetId(); /** * Get alarm message. * * @return */ - public String getAlarmMessage(); + String getAlarmMessage(); /** * Get event id that triggered alarm. * * @return */ - public UUID getTriggeringEventId(); + UUID getTriggeringEventId(); /** * Get alarm state. * * @return */ - public DeviceAlarmState getState(); + DeviceAlarmState getState(); /** * Get date the alarm was triggered. * * @return */ - public Date getTriggeredDate(); + Date getTriggeredDate(); /** * Get date the alarm was acknowledged. * * @return */ - public Date getAcknowledgedDate(); + Date getAcknowledgedDate(); /** * Get date the alarm was resolved. * * @return */ - public Date getResolvedDate(); + Date getResolvedDate(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignment.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignment.java index 1d3dc2d..3bbd2dc 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignment.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignment.java @@ -23,54 +23,54 @@ public interface IDeviceAssignment extends IPersistentEntity { * * @return */ - public UUID getDeviceId(); + UUID getDeviceId(); /** * Get unique id for assigned device type at time of assignment. * * @return */ - public UUID getDeviceTypeId(); + UUID getDeviceTypeId(); /** * Get unqiue id for customer assigned to device. * * @return */ - public UUID getCustomerId(); + UUID getCustomerId(); /** * Get unique id for area assigned to device. * * @return */ - public UUID getAreaId(); + UUID getAreaId(); /** * Get asset id. * * @return */ - public UUID getAssetId(); + UUID getAssetId(); /** * Get the device assignment status. * * @return */ - public DeviceAssignmentStatus getStatus(); + DeviceAssignmentStatus getStatus(); /** * Get the date/time at which the assignment was made active. * * @return */ - public Date getActiveDate(); + Date getActiveDate(); /** * Get the date/time at which the assignment was released. * * @return */ - public Date getReleasedDate(); + Date getReleasedDate(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceElementMapping.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceElementMapping.java index c755119..0d3b787 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceElementMapping.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceElementMapping.java @@ -21,12 +21,12 @@ public interface IDeviceElementMapping extends Serializable { * * @return */ - public String getDeviceElementSchemaPath(); + String getDeviceElementSchemaPath(); /** * Get token of {@link IDevice} being mapped. * * @return */ - public String getDeviceToken(); + String getDeviceToken(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceNestingContext.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceNestingContext.java index fc40fd8..a378697 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceNestingContext.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceNestingContext.java @@ -19,7 +19,7 @@ public interface IDeviceNestingContext { * * @return */ - public IDevice getGateway(); + IDevice getGateway(); /** * Get nested device being addressed. In standalone devices, this value will be @@ -27,7 +27,7 @@ public interface IDeviceNestingContext { * * @return */ - public IDevice getNested(); + IDevice getNested(); /** * Get path in parent device {@link IDeviceElementSchema} mapped to target @@ -35,5 +35,5 @@ public interface IDeviceNestingContext { * * @return */ - public String getPath(); + String getPath(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceStatus.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceStatus.java index 4ef998c..e374b47 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceStatus.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceStatus.java @@ -24,19 +24,19 @@ public interface IDeviceStatus extends IPersistentEntity, IColorProvider, IIconP * * @return */ - public String getCode(); + String getCode(); /** * Get unqiue id for the parent device type. * * @return */ - public UUID getDeviceTypeId(); + UUID getDeviceTypeId(); /** * Name displayed in user interface. * * @return */ - public String getName(); + String getName(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceType.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceType.java index f016678..98495ed 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceType.java @@ -22,12 +22,12 @@ public interface IDeviceType extends IBrandedEntity, IAccessible { * * @return */ - public DeviceContainerPolicy getContainerPolicy(); + DeviceContainerPolicy getContainerPolicy(); /** * Get schema that describes how nested devices are arranged. * * @return */ - public UUID getDeviceElementSchemaId(); + UUID getDeviceElementSchemaId(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/asset/IDeviceEventWithAsset.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/asset/IDeviceEventWithAsset.java index 14466ba..77d2ed7 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/asset/IDeviceEventWithAsset.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/asset/IDeviceEventWithAsset.java @@ -20,5 +20,5 @@ public interface IDeviceEventWithAsset extends IDeviceEvent { * * @return */ - public String getAssetName(); + String getAssetName(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/charting/IChartEntry.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/charting/IChartEntry.java index 72acdc1..145ebac 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/charting/IChartEntry.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/charting/IChartEntry.java @@ -22,12 +22,12 @@ public interface IChartEntry extends Comparable>, Serializable * * @return */ - public T getValue(); + T getValue(); /** * Get date the value was measured. * * @return */ - public Date getMeasurementDate(); + Date getMeasurementDate(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/charting/IChartSeries.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/charting/IChartSeries.java index 88f6bbb..6108771 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/charting/IChartSeries.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/charting/IChartSeries.java @@ -22,12 +22,12 @@ public interface IChartSeries extends Serializable { * * @return */ - public String getMeasurementId(); + String getMeasurementId(); /** * Get data entries for the series. * * @return */ - public List> getEntries(); + List> getEntries(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ICommandParameter.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ICommandParameter.java index 28a2c75..2903096 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ICommandParameter.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ICommandParameter.java @@ -17,19 +17,19 @@ public interface ICommandParameter { * * @return */ - public String getName(); + String getName(); /** * Get parameter datatype. * * @return */ - public ParameterType getType(); + ParameterType getType(); /** * Indicates if parameter is required for command. * * @return */ - public boolean isRequired(); + boolean isRequired(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommand.java index 54e3ba9..22b3733 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommand.java @@ -23,19 +23,19 @@ public interface IDeviceCommand extends IPersistentEntity, IAccessible { * * @return */ - public UUID getDeviceTypeId(); + UUID getDeviceTypeId(); /** * Optional namespace for distinguishing commands. * * @return */ - public String getNamespace(); + String getNamespace(); /** * Get list of parameters. * * @return */ - public List getParameters(); + List getParameters(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommandExecution.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommandExecution.java index 7b55f24..ad06108 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommandExecution.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommandExecution.java @@ -24,19 +24,19 @@ public interface IDeviceCommandExecution extends Serializable { * * @return */ - public IDeviceCommand getCommand(); + IDeviceCommand getCommand(); /** * Get the invocation details. * * @return */ - public IDeviceCommandInvocation getInvocation(); + IDeviceCommandInvocation getInvocation(); /** * Get parameters populated with data from the invocation. * * @return */ - public Map getParameters(); + Map getParameters(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommandNamespace.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommandNamespace.java index 4d86c1b..c9e845b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommandNamespace.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommandNamespace.java @@ -20,12 +20,12 @@ public interface IDeviceCommandNamespace extends Serializable { * * @return */ - public String getValue(); + String getValue(); /** * List of commands in namespace. * * @return */ - public List getCommands(); + List getCommands(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceMappingAckCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceMappingAckCommand.java index f94715d..fb68e3b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceMappingAckCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceMappingAckCommand.java @@ -20,5 +20,5 @@ public interface IDeviceMappingAckCommand extends ISystemCommand, Serializable { * * @return */ - public DeviceMappingResult getResult(); + DeviceMappingResult getResult(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceStreamAckCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceStreamAckCommand.java index 8083eff..a6f2ec2 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceStreamAckCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceStreamAckCommand.java @@ -20,12 +20,12 @@ public interface IDeviceStreamAckCommand extends ISystemCommand, Serializable { * * @return */ - public UUID getStreamId(); + UUID getStreamId(); /** * Get status of stream creation. * * @return */ - public DeviceStreamStatus getStatus(); + DeviceStreamStatus getStatus(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IRegistrationAckCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IRegistrationAckCommand.java index eb9dc18..bd15ff1 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IRegistrationAckCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IRegistrationAckCommand.java @@ -19,5 +19,5 @@ public interface IRegistrationAckCommand extends ISystemCommand, Serializable { * * @return */ - public RegistrationSuccessReason getReason(); + RegistrationSuccessReason getReason(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IRegistrationFailureCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IRegistrationFailureCommand.java index bf07338..911b7ca 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IRegistrationFailureCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IRegistrationFailureCommand.java @@ -19,12 +19,12 @@ public interface IRegistrationFailureCommand extends ISystemCommand, Serializabl * * @return */ - public RegistrationFailureReason getReason(); + RegistrationFailureReason getReason(); /** * Get error message. * * @return */ - public String getErrorMessage(); + String getErrorMessage(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ISendDeviceStreamDataCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ISendDeviceStreamDataCommand.java index 4f750bd..e85bfb7 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ISendDeviceStreamDataCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ISendDeviceStreamDataCommand.java @@ -20,26 +20,26 @@ public interface ISendDeviceStreamDataCommand extends ISystemCommand, Serializab * * @return */ - public String getDeviceToken(); + String getDeviceToken(); /** * Get id of stream data belongs to. * * @return */ - public UUID getStreamId(); + UUID getStreamId(); /** * Get sequence number of data chunk. * * @return */ - public long getSequenceNumber(); + long getSequenceNumber(); /** * Get data. * * @return */ - public byte[] getData(); + byte[] getData(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ISystemCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ISystemCommand.java index 6aa7375..e30a850 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ISystemCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ISystemCommand.java @@ -19,5 +19,5 @@ public interface ISystemCommand extends Serializable { * * @return */ - public SystemCommandType getType(); + SystemCommandType getType(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceElement.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceElement.java index 1e17fd7..2503015 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceElement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceElement.java @@ -21,12 +21,12 @@ public interface IDeviceElement extends IPersistentEntity, Serializable { * * @return */ - public String getName(); + String getName(); /** * Get relative path to element from parent. * * @return */ - public String getPath(); + String getPath(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceUnit.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceUnit.java index 17ad63c..de05937 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceUnit.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceUnit.java @@ -19,12 +19,12 @@ public interface IDeviceUnit extends IDeviceElement { * * @return */ - public List getDeviceSlots(); + List getDeviceSlots(); /** * Get list of subordinate units associated with the unit. * * @return */ - public List getDeviceUnits(); + List getDeviceUnits(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlert.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlert.java index 9d2ebae..b7b5ffb 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlert.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlert.java @@ -17,26 +17,26 @@ public interface IDeviceAlert extends IDeviceEvent { * * @return */ - public AlertSource getSource(); + AlertSource getSource(); /** * Get severity of alert. * * @return */ - public AlertLevel getLevel(); + AlertLevel getLevel(); /** * Get the alert type indicator. * * @return */ - public String getType(); + String getType(); /** * Get the alert message. * * @return */ - public String getMessage(); + String getMessage(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceCommandInvocation.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceCommandInvocation.java index 3b33e7f..61f55d8 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceCommandInvocation.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceCommandInvocation.java @@ -20,40 +20,40 @@ public interface IDeviceCommandInvocation extends IDeviceEvent { * * @return */ - public CommandInitiator getInitiator(); + CommandInitiator getInitiator(); /** * Get unique id of command initiated. * * @return */ - public String getInitiatorId(); + String getInitiatorId(); /** * Get actor type that received command. * * @return */ - public CommandTarget getTarget(); + CommandTarget getTarget(); /** * Get unique id of command target. * * @return */ - public String getTargetId(); + String getTargetId(); /** * Get unique id of device command being invoked. * * @return */ - public UUID getDeviceCommandId(); + UUID getDeviceCommandId(); /** * Get the list of parameter names mapped to values. * * @return */ - public Map getParameterValues(); + Map getParameterValues(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceCommandResponse.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceCommandResponse.java index 726328c..32f63b3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceCommandResponse.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceCommandResponse.java @@ -19,19 +19,19 @@ public interface IDeviceCommandResponse extends IDeviceEvent { * * @return */ - public UUID getOriginatingEventId(); + UUID getOriginatingEventId(); /** * Get id of event sent as a response. * * @return */ - public UUID getResponseEventId(); + UUID getResponseEventId(); /** * Get response payload. * * @return */ - public String getResponse(); + String getResponse(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEvent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEvent.java index 591717d..1fc5b07 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEvent.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEvent.java @@ -23,7 +23,7 @@ public interface IDeviceEvent extends IMetadataProvider, Serializable { * * @return */ - public UUID getId(); + UUID getId(); /** * Get alternate id that can be used for correlating events with external @@ -31,61 +31,61 @@ public interface IDeviceEvent extends IMetadataProvider, Serializable { * * @return */ - public String getAlternateId(); + String getAlternateId(); /** * Get event type indicator. * * @return */ - public DeviceEventType getEventType(); + DeviceEventType getEventType(); /** * Get device id. * * @return */ - public UUID getDeviceId(); + UUID getDeviceId(); /** * Get assignment id. * * @return */ - public UUID getDeviceAssignmentId(); + UUID getDeviceAssignmentId(); /** * Get customer id if assigned. * * @return */ - public UUID getCustomerId(); + UUID getCustomerId(); /** * Get area id if assigned. * * @return */ - public UUID getAreaId(); + UUID getAreaId(); /** * Get asset id if assigned. * * @return */ - public UUID getAssetId(); + UUID getAssetId(); /** * Get the date the event occurred. * * @return */ - public Date getEventDate(); + Date getEventDate(); /** * Get the date this event was received. * * @return */ - public Date getReceivedDate(); + Date getReceivedDate(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventBatch.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventBatch.java index 47df710..9fa3fa0 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventBatch.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventBatch.java @@ -23,26 +23,26 @@ public interface IDeviceEventBatch { * * @return */ - public String getDeviceToken(); + String getDeviceToken(); /** * Get a list of device measurements create requests. * * @return */ - public List getMeasurements(); + List getMeasurements(); /** * Get a list of device location create requests. * * @return */ - public List getLocations(); + List getLocations(); /** * Get a list of device alert create requests. * * @return */ - public List getAlerts(); + List getAlerts(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventBatchResponse.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventBatchResponse.java index 76b1d3c..4b68f17 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventBatchResponse.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventBatchResponse.java @@ -19,19 +19,19 @@ public interface IDeviceEventBatchResponse { * * @return */ - public List getCreatedMeasurements(); + List getCreatedMeasurements(); /** * List of locations that were created. * * @return */ - public List getCreatedLocations(); + List getCreatedLocations(); /** * List of alerts that were created. * * @return */ - public List getCreatedAlerts(); + List getCreatedAlerts(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventContext.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventContext.java index a84bea6..987f31a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventContext.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventContext.java @@ -24,47 +24,47 @@ public interface IDeviceEventContext { * * @return */ - public UUID getDeviceId(); + UUID getDeviceId(); /** * Get id for device type. * * @return */ - public UUID getDeviceTypeId(); + UUID getDeviceTypeId(); /** * If contained by a parent device, returns the parent id. * * @return */ - public UUID getParentDeviceId(); + UUID getParentDeviceId(); /** * Get most recent device status. * * @return */ - public String getDeviceStatus(); + String getDeviceStatus(); /** * Get a map of device metadata. * * @return */ - public Map getDeviceMetadata(); + Map getDeviceMetadata(); /** * Get the device assignment status. * * @return */ - public DeviceAssignmentStatus getAssignmentStatus(); + DeviceAssignmentStatus getAssignmentStatus(); /** * Get a map of device assignment metadata. * * @return */ - public Map getAssignmentMetadata(); + Map getAssignmentMetadata(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventOriginator.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventOriginator.java index 026e8ea..f32f8c9 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventOriginator.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventOriginator.java @@ -20,5 +20,5 @@ public interface IDeviceEventOriginator extends Serializable { * * @return */ - public UUID getEventId(); + UUID getEventId(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocation.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocation.java index 5f224c7..e10339d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocation.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocation.java @@ -17,19 +17,19 @@ public interface IDeviceLocation extends IDeviceEvent { * * @return */ - public Double getLatitude(); + Double getLatitude(); /** * Get longitude value. * * @return */ - public Double getLongitude(); + Double getLongitude(); /** * Get elevation value. * * @return */ - public Double getElevation(); + Double getElevation(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurement.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurement.java index 8a94ad3..adff25f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurement.java @@ -19,12 +19,12 @@ public interface IDeviceMeasurement extends IDeviceEvent, Serializable { * * @return */ - public String getName(); + String getName(); /** * Get measurement value. * * @return */ - public Double getValue(); + Double getValue(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementClassifier.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementClassifier.java index 5bf6035..be20ba8 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementClassifier.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementClassifier.java @@ -22,5 +22,5 @@ public interface IDeviceMeasurementClassifier extends IPersistentEntity, IAccess * * @return */ - public String getUnit(); + String getUnit(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceStateChange.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceStateChange.java index c4466a8..f1230ef 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceStateChange.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceStateChange.java @@ -20,26 +20,26 @@ public interface IDeviceStateChange extends IDeviceEvent, Serializable { * * @return */ - public String getAttribute(); + String getAttribute(); /** * Get type of state change. * * @return */ - public String getType(); + String getType(); /** * Get the previous (or assumed previous) state. * * @return */ - public String getPreviousState(); + String getPreviousState(); /** * Get the requested new state. * * @return */ - public String getNewState(); + String getNewState(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IDecodedEventPayload.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IDecodedEventPayload.java index 2e46ab8..2489bc4 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IDecodedEventPayload.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IDecodedEventPayload.java @@ -20,26 +20,26 @@ public interface IDecodedEventPayload { * * @return */ - public String getSourceId(); + String getSourceId(); /** * Get device token. * * @return */ - public String getDeviceToken(); + String getDeviceToken(); /** * Get id of originating event. * * @return */ - public String getOriginator(); + String getOriginator(); /** * Get event create request. * * @return */ - public IDeviceEventCreateRequest getEventCreateRequest(); + IDeviceEventCreateRequest getEventCreateRequest(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IDeviceRegistrationPayload.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IDeviceRegistrationPayload.java index 8bf8c02..0de6360 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IDeviceRegistrationPayload.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IDeviceRegistrationPayload.java @@ -22,26 +22,26 @@ public interface IDeviceRegistrationPayload extends Serializable { * * @return */ - public String getSourceId(); + String getSourceId(); /** * Get device token. * * @return */ - public String getDeviceToken(); + String getDeviceToken(); /** * Get id of originating event. * * @return */ - public String getOriginator(); + String getOriginator(); /** * Get device registration request. * * @return */ - public IDeviceRegistrationRequest getDeviceRegistrationRequest(); + IDeviceRegistrationRequest getDeviceRegistrationRequest(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IEnrichedEventPayload.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IEnrichedEventPayload.java index ec2a544..07dcd80 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IEnrichedEventPayload.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IEnrichedEventPayload.java @@ -21,12 +21,12 @@ public interface IEnrichedEventPayload { * * @return */ - public IDeviceEventContext getEventContext(); + IDeviceEventContext getEventContext(); /** * Get event data. * * @return */ - public IDeviceEvent getEvent(); + IDeviceEvent getEvent(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IPreprocessedEventPayload.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IPreprocessedEventPayload.java index 5b8ca8f..50acdb9 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IPreprocessedEventPayload.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IPreprocessedEventPayload.java @@ -20,12 +20,12 @@ public interface IPreprocessedEventPayload extends IDecodedEventPayload { * * @return */ - public UUID getDeviceId(); + UUID getDeviceId(); /** * Get unique device assignment id. * * @return */ - public UUID getDeviceAssignmentId(); + UUID getDeviceAssignmentId(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceAlertCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceAlertCreateRequest.java index dca1cf9..2695859 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceAlertCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceAlertCreateRequest.java @@ -20,26 +20,26 @@ public interface IDeviceAlertCreateRequest extends IDeviceEventCreateRequest { * * @return */ - public AlertSource getSource(); + AlertSource getSource(); /** * Get alert severity. * * @return */ - public AlertLevel getLevel(); + AlertLevel getLevel(); /** * Get the alert type indicator. * * @return */ - public String getType(); + String getType(); /** * Get the alert message. * * @return */ - public String getMessage(); + String getMessage(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceAssignmentEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceAssignmentEventCreateRequest.java index 43b352e..cc0b527 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceAssignmentEventCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceAssignmentEventCreateRequest.java @@ -19,12 +19,12 @@ public interface IDeviceAssignmentEventCreateRequest { * * @return */ - public UUID getDeviceAssignmentId(); + UUID getDeviceAssignmentId(); /** * Get request information for event to be posted. * * @return */ - public IDeviceEventCreateRequest getRequest(); + IDeviceEventCreateRequest getRequest(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceCommandInvocationCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceCommandInvocationCreateRequest.java index 3226a17..6a575fb 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceCommandInvocationCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceCommandInvocationCreateRequest.java @@ -22,40 +22,40 @@ public interface IDeviceCommandInvocationCreateRequest extends IDeviceEventCreat * * @return */ - public CommandInitiator getInitiator(); + CommandInitiator getInitiator(); /** * Get unique id of command inititator. * * @return */ - public String getInitiatorId(); + String getInitiatorId(); /** * Get command target type. * * @return */ - public CommandTarget getTarget(); + CommandTarget getTarget(); /** * Get unique id of command target. * * @return */ - public String getTargetId(); + String getTargetId(); /** * Get unique token for command to invoke. * * @return */ - public String getCommandToken(); + String getCommandToken(); /** * Get the list of parameter names mapped to values. * * @return */ - public Map getParameterValues(); + Map getParameterValues(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceCommandResponseCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceCommandResponseCreateRequest.java index 23f1dc5..62beee3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceCommandResponseCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceCommandResponseCreateRequest.java @@ -21,19 +21,19 @@ public interface IDeviceCommandResponseCreateRequest extends IDeviceEventCreateR * * @return */ - public UUID getOriginatingEventId(); + UUID getOriginatingEventId(); /** * Get id of event sent as a response. * * @return */ - public UUID getResponseEventId(); + UUID getResponseEventId(); /** * Get response payload. * * @return */ - public String getResponse(); + String getResponse(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceEventCreateRequest.java index 3ae6d4b..c44f2ad 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceEventCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceEventCreateRequest.java @@ -24,21 +24,21 @@ public interface IDeviceEventCreateRequest extends Serializable { * * @return */ - public String getAlternateId(); + String getAlternateId(); /** * Get event type indicator. * * @return */ - public DeviceEventType getEventType(); + DeviceEventType getEventType(); /** * Get the date on which the event occurred. * * @return */ - public Date getEventDate(); + Date getEventDate(); /** * Indicates whether state information on the device assignment should be @@ -46,12 +46,12 @@ public interface IDeviceEventCreateRequest extends Serializable { * * @return */ - public boolean isUpdateState(); + boolean isUpdateState(); /** * Get metadata values. * * @return */ - public Map getMetadata(); + Map getMetadata(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceLocationCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceLocationCreateRequest.java index 6c9e742..e1d62ec 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceLocationCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceLocationCreateRequest.java @@ -17,19 +17,19 @@ public interface IDeviceLocationCreateRequest extends IDeviceEventCreateRequest * * @return */ - public Double getLatitude(); + Double getLatitude(); /** * Get longitude. * * @return */ - public Double getLongitude(); + Double getLongitude(); /** * Get elevation.s * * @return */ - public Double getElevation(); + Double getElevation(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceMeasurementCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceMeasurementCreateRequest.java index 715c0a2..bbfb558 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceMeasurementCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceMeasurementCreateRequest.java @@ -19,12 +19,12 @@ public interface IDeviceMeasurementCreateRequest extends IDeviceEventCreateReque * * @return */ - public String getName(); + String getName(); /** * Get measurement value. * * @return */ - public double getValue(); + double getValue(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceRegistrationRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceRegistrationRequest.java index 37feb9e..8ec1232 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceRegistrationRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceRegistrationRequest.java @@ -19,12 +19,12 @@ public interface IDeviceRegistrationRequest extends IDeviceCreateRequest { * * @return */ - public String getCustomerToken(); + String getCustomerToken(); /** * Get token for area to which device should be assigned. * * @return */ - public String getAreaToken(); + String getAreaToken(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceStateChangeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceStateChangeCreateRequest.java index 8b4e996..2bbe8b0 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceStateChangeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceStateChangeCreateRequest.java @@ -26,26 +26,26 @@ public interface IDeviceStateChangeCreateRequest extends IDeviceEventCreateReque * * @return */ - public String getAttribute(); + String getAttribute(); /** * Get type of state change. * * @return */ - public String getType(); + String getType(); /** * Get the previous (or assumed previous) state. * * @return */ - public String getPreviousState(); + String getPreviousState(); /** * Get the requested new state. * * @return */ - public String getNewState(); + String getNewState(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceStreamCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceStreamCreateRequest.java index 6c0c075..4fd82ea 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceStreamCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceStreamCreateRequest.java @@ -20,5 +20,5 @@ public interface IDeviceStreamCreateRequest extends IPersistentEntityCreateReque * * @return */ - public String getContentType(); + String getContentType(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/ISendDeviceStreamDataRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/ISendDeviceStreamDataRequest.java index c6830de..4062888 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/ISendDeviceStreamDataRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/ISendDeviceStreamDataRequest.java @@ -19,12 +19,12 @@ public interface ISendDeviceStreamDataRequest { * * @return */ - public UUID getStreamId(); + UUID getStreamId(); /** * Get sequence number of chunk to send. * * @return */ - public long getSequenceNumber(); + long getSequenceNumber(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/streaming/IEventStreamAck.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/streaming/IEventStreamAck.java index f1458a6..1f349a0 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/streaming/IEventStreamAck.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/streaming/IEventStreamAck.java @@ -17,5 +17,5 @@ public interface IEventStreamAck { * * @return */ - public long getProcessedEventCount(); + long getProcessedEventCount(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroup.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroup.java index 986908f..2719ce1 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroup.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroup.java @@ -22,5 +22,5 @@ public interface IDeviceGroup extends IBrandedEntity, IAccessible { * * @return */ - public List getRoles(); + List getRoles(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroupElement.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroupElement.java index 9534ab2..1a7fcc6 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroupElement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroupElement.java @@ -22,7 +22,7 @@ public interface IDeviceGroupElement extends IPersistentEntity { * * @return */ - public UUID getGroupId(); + UUID getGroupId(); /** * Get id of device (only one of device id or nested group id should be @@ -30,7 +30,7 @@ public interface IDeviceGroupElement extends IPersistentEntity { * * @return */ - public UUID getDeviceId(); + UUID getDeviceId(); /** * Get id of nested group (only one of device id or nested group id should be @@ -38,12 +38,12 @@ public interface IDeviceGroupElement extends IPersistentEntity { * * @return */ - public UUID getNestedGroupId(); + UUID getNestedGroupId(); /** * Get list of roles associated with element. * * @return */ - public List getRoles(); + List getRoles(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAlarmCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAlarmCreateRequest.java index f534660..066440a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAlarmCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAlarmCreateRequest.java @@ -25,54 +25,54 @@ public interface IDeviceAlarmCreateRequest extends Serializable { * * @return */ - public String getDeviceAssignmentToken(); + String getDeviceAssignmentToken(); /** * Get alarm message. * * @return */ - public String getAlarmMessage(); + String getAlarmMessage(); /** * Get event id that triggered alarm. * * @return */ - public UUID getTriggeringEventId(); + UUID getTriggeringEventId(); /** * Get alarm state. * * @return */ - public DeviceAlarmState getState(); + DeviceAlarmState getState(); /** * Get date the alarm was triggered. * * @return */ - public Date getTriggeredDate(); + Date getTriggeredDate(); /** * Get date the alarm was acknowledged. * * @return */ - public Date getAcknowledgedDate(); + Date getAcknowledgedDate(); /** * Get date the alarm was resolved. * * @return */ - public Date getResolvedDate(); + Date getResolvedDate(); /** * Get metadata values. * * @return */ - public Map getMetadata(); + Map getMetadata(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAssignmentBulkRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAssignmentBulkRequest.java index af8a33d..6020a19 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAssignmentBulkRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAssignmentBulkRequest.java @@ -19,5 +19,5 @@ public interface IDeviceAssignmentBulkRequest { * * @return */ - public List getDeviceAssignmentTokens(); + List getDeviceAssignmentTokens(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAssignmentCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAssignmentCreateRequest.java index 5ec34aa..c91bd39 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAssignmentCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAssignmentCreateRequest.java @@ -20,33 +20,33 @@ public interface IDeviceAssignmentCreateRequest extends IPersistentEntityCreateR * * @return */ - public String getDeviceToken(); + String getDeviceToken(); /** * Get token of customer if assigned. * * @return */ - public String getCustomerToken(); + String getCustomerToken(); /** * Get token of area if assigned. * * @return */ - public String getAreaToken(); + String getAreaToken(); /** * Get token of asset if assigned. * * @return */ - public String getAssetToken(); + String getAssetToken(); /** * Get the device assignment status. * * @return */ - public DeviceAssignmentStatus getStatus(); + DeviceAssignmentStatus getStatus(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceCommandCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceCommandCreateRequest.java index 6088851..35f2b93 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceCommandCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceCommandCreateRequest.java @@ -22,33 +22,33 @@ public interface IDeviceCommandCreateRequest extends IPersistentEntityCreateRequ * * @return */ - public String getDeviceTypeToken(); + String getDeviceTypeToken(); /** * Optional namespace for distinguishing commands. * * @return */ - public String getNamespace(); + String getNamespace(); /** * Get command name. * * @return */ - public String getName(); + String getName(); /** * Get command description. * * @return */ - public String getDescription(); + String getDescription(); /** * Get list of parameters. * * @return */ - public List getParameters(); + List getParameters(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceCreateRequest.java index a32d310..3b67ef2 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceCreateRequest.java @@ -22,40 +22,40 @@ public interface IDeviceCreateRequest extends IPersistentEntityCreateRequest { * * @return */ - public String getDeviceTypeToken(); + String getDeviceTypeToken(); /** * Get parent device token (if nested). * * @return */ - public String getParentDeviceToken(); + String getParentDeviceToken(); /** * Indicates whether parent reference should be removed. * * @return */ - public Boolean isRemoveParentHardwareId(); + Boolean isRemoveParentHardwareId(); /** * Get the list of device element mappings. * * @return */ - public List getDeviceElementMappings(); + List getDeviceElementMappings(); /** * Get comments associated with device. * * @return */ - public String getComments(); + String getComments(); /** * Get device status indicator code. * * @return */ - public String getStatus(); + String getStatus(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupCreateRequest.java index 0672e8e..379de7b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupCreateRequest.java @@ -22,5 +22,5 @@ public interface IDeviceGroupCreateRequest extends IAccessible, IBrandedEntityCr * * @return */ - public List getRoles(); + List getRoles(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupElementCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupElementCreateRequest.java index 5098d4a..7ebfc7b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupElementCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupElementCreateRequest.java @@ -21,19 +21,19 @@ public interface IDeviceGroupElementCreateRequest extends IPersistentEntityCreat * * @return */ - public String getDeviceToken(); + String getDeviceToken(); /** * Get nested group token (null if device supplied). * * @return */ - public String getNestedGroupToken(); + String getNestedGroupToken(); /** * Get list of roles associated with element. * * @return */ - public List getRoles(); + List getRoles(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceStatusCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceStatusCreateRequest.java index 688622c..ba04479 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceStatusCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceStatusCreateRequest.java @@ -21,19 +21,19 @@ public interface IDeviceStatusCreateRequest extends IPersistentEntityCreateReque * * @return */ - public String getDeviceTypeToken(); + String getDeviceTypeToken(); /** * Get the unique status code. * * @return */ - public String getCode(); + String getCode(); /** * Name displayed in user interface. * * @return */ - public String getName(); + String getName(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceTypeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceTypeCreateRequest.java index a4db560..04328b2 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceTypeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceTypeCreateRequest.java @@ -22,12 +22,12 @@ public interface IDeviceTypeCreateRequest extends IAccessible, IBrandedEntityCre * * @return */ - public DeviceContainerPolicy getContainerPolicy(); + DeviceContainerPolicy getContainerPolicy(); /** * Get {@link IDeviceElementSchema} for locating nested devices. * * @return */ - public String getDeviceElementSchemaToken(); + String getDeviceElementSchemaToken(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IDeviceState.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IDeviceState.java index eafc94c..6feb78e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IDeviceState.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IDeviceState.java @@ -7,76 +7,77 @@ */ package com.sitewhere.spi.device.state; +import java.io.Serializable; import java.util.Date; import java.util.UUID; -import com.sitewhere.spi.common.IPersistentEntity; +import com.sitewhere.spi.common.IMetadataProvider; /** * Contains most recent state information for a device. */ -public interface IDeviceState extends IPersistentEntity { +public interface IDeviceState extends IMetadataProvider, Serializable { /** * Get id. * * @return */ - public UUID getId(); + UUID getId(); /** * Get device id. * * @return */ - public UUID getDeviceId(); + UUID getDeviceId(); /** - * Get device type id. + * Get device assignment id. * * @return */ - public UUID getDeviceTypeId(); + UUID getDeviceAssignmentId(); /** - * Get device assignment id. + * Get device type id. * * @return */ - public UUID getDeviceAssignmentId(); + UUID getDeviceTypeId(); /** * Get customer id if assigned. * * @return */ - public UUID getCustomerId(); + UUID getCustomerId(); /** * Get area id if assigned. * * @return */ - public UUID getAreaId(); + UUID getAreaId(); /** * Get asset id if assigned. * * @return */ - public UUID getAssetId(); + UUID getAssetId(); /** * Get date of last device interaction. * * @return */ - public Date getLastInteractionDate(); + Date getLastInteractionDate(); /** * Get date device was marked as missing. * * @return */ - public Date getPresenceMissingDate(); + Date getPresenceMissingDate(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateCreateRequest.java index 2372354..02075dc 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateCreateRequest.java @@ -21,54 +21,54 @@ public interface IDeviceStateCreateRequest extends Serializable { * * @return */ - public UUID getDeviceId(); + UUID getDeviceId(); /** * Get device type id. * * @return */ - public UUID getDeviceTypeId(); + UUID getDeviceTypeId(); /** * Get device assignment id. * * @return */ - public UUID getDeviceAssignmentId(); + UUID getDeviceAssignmentId(); /** * Get customer id if assigned. * * @return */ - public UUID getCustomerId(); + UUID getCustomerId(); /** * Get area id if assigned. * * @return */ - public UUID getAreaId(); + UUID getAreaId(); /** * Get asset id if assigned. * * @return */ - public UUID getAssetId(); + UUID getAssetId(); /** * Get date of last device interaction. * * @return */ - public Date getLastInteractionDate(); + Date getLastInteractionDate(); /** * Get date device was marked as missing. * * @return */ - public Date getPresenceMissingDate(); + Date getPresenceMissingDate(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/IDeviceStream.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/IDeviceStream.java index e896c17..391fca5 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/IDeviceStream.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/IDeviceStream.java @@ -21,19 +21,19 @@ public interface IDeviceStream extends IPersistentEntity { * * @return */ - public UUID getAssignmentId(); + UUID getAssignmentId(); /** * Get unique identifier for stream within assignment. * * @return */ - public String getStreamId(); + String getStreamId(); /** * Get content type of stream data. * * @return */ - public String getContentType(); + String getContentType(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/IDeviceStreamData.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/IDeviceStreamData.java index 6242a2c..acd6805 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/IDeviceStreamData.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/IDeviceStreamData.java @@ -19,19 +19,19 @@ public interface IDeviceStreamData extends IDeviceEvent { * * @return */ - public String getStreamId(); + String getStreamId(); /** * Get sequence number for ordering chunks. * * @return */ - public Long getSequenceNumber(); + Long getSequenceNumber(); /** * Get chunk data. * * @return */ - public byte[] getData(); + byte[] getData(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/request/IDeviceStreamDataCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/request/IDeviceStreamDataCreateRequest.java index 087748f..05be5f9 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/request/IDeviceStreamDataCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/request/IDeviceStreamDataCreateRequest.java @@ -19,19 +19,19 @@ public interface IDeviceStreamDataCreateRequest extends IDeviceEventCreateReques * * @return */ - public String getStreamId(); + String getStreamId(); /** * Get sequence number for ordering chunks. * * @return */ - public long getSequenceNumber(); + long getSequenceNumber(); /** * Get chunk data. * * @return */ - public byte[] getData(); + byte[] getData(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/IZoneMatcher.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/IZoneMatcher.java index 28e5111..97b1ff4 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/IZoneMatcher.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/IZoneMatcher.java @@ -21,14 +21,14 @@ public interface IZoneMatcher { * * @return */ - public IDeviceLocation getLocation(); + IDeviceLocation getLocation(); /** * Get the map of all relationships. * * @return */ - public Map getRelationships(); + Map getRelationships(); /** * Get relationship with the given zone. @@ -36,5 +36,5 @@ public interface IZoneMatcher { * @param zoneId * @return */ - public IZoneRelationship getRelationship(String zoneId); + IZoneRelationship getRelationship(String zoneId); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/IZoneRelationship.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/IZoneRelationship.java index b93118a..3526fb9 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/IZoneRelationship.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/IZoneRelationship.java @@ -20,19 +20,19 @@ public interface IZoneRelationship { * * @return */ - public IDeviceLocation getLocation(); + IDeviceLocation getLocation(); /** * Get zone. * * @return */ - public IZone getZone(); + IZone getZone(); /** * Get containment indicator. * * @return */ - public ZoneContainment getContainment(); + ZoneContainment getContainment(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/label/ILabel.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/label/ILabel.java index 1853dce..6768153 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/label/ILabel.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/label/ILabel.java @@ -17,5 +17,5 @@ public interface ILabel { * * @return */ - public byte[] getContent(); + byte[] getContent(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/microservice/IMicroserviceSummary.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/microservice/IMicroserviceSummary.java index fb02d96..e94791c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/microservice/IMicroserviceSummary.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/microservice/IMicroserviceSummary.java @@ -17,68 +17,68 @@ public interface IMicroserviceSummary { * * @return */ - public String getId(); + String getId(); /** * Get display name. * * @return */ - public String getName(); + String getName(); /** * Get description. * * @return */ - public String getDescription(); + String getDescription(); /** * Functional area for microservice. * * @return */ - public String getFunctionalArea(); + String getFunctionalArea(); /** * Get icon displayed in UI. * * @return */ - public String getIcon(); + String getIcon(); /** * Flag for whether microservice is multitenant. * * @return */ - public boolean isMultitenant(); + boolean isMultitenant(); /** * Get tag for Docker image used by microservice. * * @return */ - public String getDockerImageTag(); + String getDockerImageTag(); /** * Flag for whether debug is enabled. * * @return */ - public boolean isDebugEnabled(); + boolean isDebugEnabled(); /** * Port for Jdwp debugging. * * @return */ - public int getDebugJdwpPort(); + int getDebugJdwpPort(); /** * Port for JMX debugging. * * @return */ - public int getDebugJmxPort(); + int getDebugJmxPort(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/ISchedule.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/ISchedule.java index 133b9e3..0a5466b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/ISchedule.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/ISchedule.java @@ -22,33 +22,33 @@ public interface ISchedule extends IPersistentEntity { * * @return */ - public String getName(); + String getName(); /** * Get type of trigger for schedule. * * @return */ - public TriggerType getTriggerType(); + TriggerType getTriggerType(); /** * Get trigger configuration values. * * @return */ - public Map getTriggerConfiguration(); + Map getTriggerConfiguration(); /** * Get date schedule takes effect. * * @return */ - public Date getStartDate(); + Date getStartDate(); /** * Get date schedule is no longer in effect. * * @return */ - public Date getEndDate(); + Date getEndDate(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/IScheduledJob.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/IScheduledJob.java index 2e4f857..dcac7a6 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/IScheduledJob.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/IScheduledJob.java @@ -22,26 +22,26 @@ public interface IScheduledJob extends IPersistentEntity { * * @return */ - public UUID getScheduleId(); + UUID getScheduleId(); /** * Get job type. * * @return */ - public ScheduledJobType getJobType(); + ScheduledJobType getJobType(); /** * Get job configuration values. * * @return */ - public Map getJobConfiguration(); + Map getJobConfiguration(); /** * Get job scheduling state. * * @return */ - public ScheduledJobState getJobState(); + ScheduledJobState getJobState(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/request/IScheduleCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/request/IScheduleCreateRequest.java index 980702d..4854f47 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/request/IScheduleCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/request/IScheduleCreateRequest.java @@ -23,33 +23,33 @@ public interface IScheduleCreateRequest extends IPersistentEntityCreateRequest { * * @return */ - public String getName(); + String getName(); /** * Get type of trigger for schedule. * * @return */ - public TriggerType getTriggerType(); + TriggerType getTriggerType(); /** * Get trigger configuration values. * * @return */ - public Map getTriggerConfiguration(); + Map getTriggerConfiguration(); /** * Get date schedule takes effect. * * @return */ - public Date getStartDate(); + Date getStartDate(); /** * Get date schedule is no longer in effect. * * @return */ - public Date getEndDate(); + Date getEndDate(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/request/IScheduledJobCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/request/IScheduledJobCreateRequest.java index 195b8e3..f146bf6 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/request/IScheduledJobCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/request/IScheduledJobCreateRequest.java @@ -23,26 +23,26 @@ public interface IScheduledJobCreateRequest extends IPersistentEntityCreateReque * * @return */ - public String getScheduleToken(); + String getScheduleToken(); /** * Get job type. * * @return */ - public ScheduledJobType getJobType(); + ScheduledJobType getJobType(); /** * Get job configuration values. * * @return */ - public Map getJobConfiguration(); + Map getJobConfiguration(); /** * Get job scheduling state. * * @return */ - public ScheduledJobState getJobState(); + ScheduledJobState getJobState(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/IDateRangeSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/IDateRangeSearchCriteria.java index afd2dea..ad8af5b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/IDateRangeSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/IDateRangeSearchCriteria.java @@ -19,12 +19,12 @@ public interface IDateRangeSearchCriteria extends ISearchCriteria { * * @return */ - public Date getStartDate(); + Date getStartDate(); /** * Get date range end. * * @return */ - public Date getEndDate(); + Date getEndDate(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ISearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ISearchCriteria.java index e9a82cc..4138bcc 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ISearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ISearchCriteria.java @@ -17,12 +17,12 @@ public interface ISearchCriteria { * * @return */ - public Integer getPageNumber(); + Integer getPageNumber(); /** * Get number of records per page of data. * * @return */ - public Integer getPageSize(); + Integer getPageSize(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ISearchResults.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ISearchResults.java index aea30d1..223ee77 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ISearchResults.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ISearchResults.java @@ -21,12 +21,12 @@ public interface ISearchResults { * * @return */ - public long getNumResults(); + long getNumResults(); /** * Get the results. * * @return */ - public List getResults(); + List getResults(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ITreeNode.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ITreeNode.java index 9caaa22..724ee42 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ITreeNode.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ITreeNode.java @@ -21,26 +21,26 @@ public interface ITreeNode extends IMetadataProvider { * * @return */ - public String getToken(); + String getToken(); /** * Get node name. * * @return */ - public String getName(); + String getName(); /** * Get node icon. * * @return */ - public String getIcon(); + String getIcon(); /** * Get node children. * * @return */ - public List getChildren(); + List getChildren(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaResponseFormat.java index e0b58d5..4c47772 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaResponseFormat.java @@ -17,19 +17,19 @@ public interface IAreaResponseFormat { * * @return */ - public Boolean getIncludeAreaType(); + Boolean getIncludeAreaType(); /** * Indicates if assignments are to be returned. * * @return */ - public Boolean getIncludeAssignments(); + Boolean getIncludeAssignments(); /** * Indicates if zones are to be returned. * * @return */ - public Boolean getIncludeZones(); + Boolean getIncludeZones(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaSearchCriteria.java index c458a41..c12f02d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaSearchCriteria.java @@ -19,19 +19,19 @@ public interface IAreaSearchCriteria extends ISearchCriteria { * * @return */ - public Boolean getRootOnly(); + Boolean getRootOnly(); /** * Only match areas of the given type. * * @return */ - public String getAreaTypeToken(); + String getAreaTypeToken(); /** * Requires that areas have the given area as a parent. * * @return */ - public String getParentAreaToken(); + String getParentAreaToken(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaTypeSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaTypeSearchCriteria.java index 5fb9a39..b072640 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaTypeSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaTypeSearchCriteria.java @@ -19,5 +19,5 @@ public interface IAreaTypeSearchCriteria extends ISearchCriteria { * * @return */ - public Boolean getIncludeContainedAreaTypes(); + Boolean getIncludeContainedAreaTypes(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/asset/IAssetSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/asset/IAssetSearchCriteria.java index ebcf121..53b2601 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/asset/IAssetSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/asset/IAssetSearchCriteria.java @@ -19,12 +19,12 @@ public interface IAssetSearchCriteria extends ISearchCriteria { * * @return */ - public String getAssetTypeToken(); + String getAssetTypeToken(); /** * Indicates if asset type are to be returned. * * @return */ - public Boolean getIncludeAssetType(); + Boolean getIncludeAssetType(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerResponseFormat.java index a87241f..a96a03a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerResponseFormat.java @@ -17,5 +17,5 @@ public interface ICustomerResponseFormat { * * @return */ - public Boolean getIncludeCustomerType(); + Boolean getIncludeCustomerType(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerSearchCriteria.java index 65bb145..a0366f2 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerSearchCriteria.java @@ -19,19 +19,19 @@ public interface ICustomerSearchCriteria extends ISearchCriteria { * * @return */ - public Boolean getRootOnly(); + Boolean getRootOnly(); /** * Requires that customers have the given customer as a parent. * * @return */ - public String getParentCustomerToken(); + String getParentCustomerToken(); /** * Require that customers have the given customer type. * * @return */ - public String getCustomerTypeToken(); + String getCustomerTypeToken(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerTypeResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerTypeResponseFormat.java index 3c1321e..a780f8f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerTypeResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerTypeResponseFormat.java @@ -17,6 +17,5 @@ public interface ICustomerTypeResponseFormat { * * @return */ - public Boolean getIncludeContainedCustomerTypes(); - + Boolean getIncludeContainedCustomerTypes(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerTypeSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerTypeSearchCriteria.java index 496be47..de5a016 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerTypeSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerTypeSearchCriteria.java @@ -13,5 +13,4 @@ * Specifies criteria used to find matching customer types. */ public interface ICustomerTypeSearchCriteria extends ISearchCriteria { - } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IBatchElementSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IBatchElementSearchCriteria.java index 7486215..0abff4b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IBatchElementSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IBatchElementSearchCriteria.java @@ -20,5 +20,5 @@ public interface IBatchElementSearchCriteria extends ISearchCriteria { * * @return */ - public ElementProcessingStatus getProcessingStatus(); + ElementProcessingStatus getProcessingStatus(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAlarmSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAlarmSearchCriteria.java index 6907978..8dfe357 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAlarmSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAlarmSearchCriteria.java @@ -22,47 +22,47 @@ public interface IDeviceAlarmSearchCriteria extends ISearchCriteria { * * @return */ - public UUID getDeviceId(); + UUID getDeviceId(); /** * Get assignment id. * * @return */ - public UUID getDeviceAssignmentId(); + UUID getDeviceAssignmentId(); /** * Get customer id if assigned. * * @return */ - public UUID getCustomerId(); + UUID getCustomerId(); /** * Get area id if assigned. * * @return */ - public UUID getAreaId(); + UUID getAreaId(); /** * Get asset id if assigned. * * @return */ - public UUID getAssetId(); + UUID getAssetId(); /** * Get event id that triggered alarm. * * @return */ - public UUID getTriggeringEventId(); + UUID getTriggeringEventId(); /** * Get alarm state. * * @return */ - public DeviceAlarmState getState(); + DeviceAlarmState getState(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAssignmentResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAssignmentResponseFormat.java index 1e30fd9..f943372 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAssignmentResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAssignmentResponseFormat.java @@ -17,33 +17,33 @@ public interface IDeviceAssignmentResponseFormat { * * @return */ - public Boolean getIncludeArea(); + Boolean getIncludeArea(); /** * Indicates if asset is to be returned. * * @return */ - public Boolean getIncludeAsset(); + Boolean getIncludeAsset(); /** * Indicates if customer is to be returned. * * @return */ - public Boolean getIncludeCustomer(); + Boolean getIncludeCustomer(); /** * Indicates if device is to be returned. * * @return */ - public Boolean getIncludeDevice(); + Boolean getIncludeDevice(); /** * Indicates if device type is to be returned. * * @return */ - public Boolean getIncludeDeviceType(); + Boolean getIncludeDeviceType(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAssignmentSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAssignmentSearchCriteria.java index 5f4d732..f37c505 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAssignmentSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAssignmentSearchCriteria.java @@ -22,40 +22,40 @@ public interface IDeviceAssignmentSearchCriteria extends ISearchCriteria { * * @return */ - public List getAssignmentStatuses(); + List getAssignmentStatuses(); /** * Limits search the given list of areas tokens. * * @return */ - public List getAreaTokens(); + List getAreaTokens(); /** * Limits search the given list of asset tokens. * * @return */ - public List getAssetTokens(); + List getAssetTokens(); /** * Limits search the given list of customer tokens. * * @return */ - public List getCustomerTokens(); + List getCustomerTokens(); /** * Limits search the given list of device tokens. * * @return */ - public List getDeviceTokens(); + List getDeviceTokens(); /** * Limits search the given list of device type tokens. * * @return */ - public List getDeviceTypeTokens(); + List getDeviceTypeTokens(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceByGroupResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceByGroupResponseFormat.java index 9c44c94..7f0b50b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceByGroupResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceByGroupResponseFormat.java @@ -17,5 +17,5 @@ public interface IDeviceByGroupResponseFormat extends IDeviceResponseFormat { * * @return */ - public Boolean getIncludeDeleted(); + Boolean getIncludeDeleted(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceCommandSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceCommandSearchCriteria.java index 558262a..391daf6 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceCommandSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceCommandSearchCriteria.java @@ -19,5 +19,5 @@ public interface IDeviceCommandSearchCriteria extends ISearchCriteria { * * @return */ - public String getDeviceTypeToken(); + String getDeviceTypeToken(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupElementResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupElementResponseFormat.java index 4d1d473..8ca6058 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupElementResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupElementResponseFormat.java @@ -17,6 +17,5 @@ public interface IDeviceGroupElementResponseFormat { * * @return */ - public Boolean getIncludeDetails(); - + Boolean getIncludeDetails(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupElementSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupElementSearchCriteria.java index 17e7601..d350489 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupElementSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupElementSearchCriteria.java @@ -19,6 +19,5 @@ public interface IDeviceGroupElementSearchCriteria extends ISearchCriteria { * * @return */ - public String getGroupToken(); - + String getGroupToken(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupSearchCriteria.java index 0c24fea..56afaf3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupSearchCriteria.java @@ -19,5 +19,5 @@ public interface IDeviceGroupSearchCriteria extends ISearchCriteria { * * @return */ - public String getRole(); + String getRole(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceResponseFormat.java index c8366c4..c4df19c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceResponseFormat.java @@ -17,13 +17,12 @@ public interface IDeviceResponseFormat { * * @return */ - public Boolean getIncludeDeviceType(); + Boolean getIncludeDeviceType(); /** * Indicates if assignment information is included. * * @return */ - public Boolean getIncludeAssignment(); - + Boolean getIncludeAssignment(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceSearchCriteria.java index eb119a5..9d96e6c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceSearchCriteria.java @@ -19,12 +19,12 @@ public interface IDeviceSearchCriteria extends IDateRangeSearchCriteria { * * @return */ - public String getDeviceTypeToken(); + String getDeviceTypeToken(); /** * Indicates whether assigned devices should be excluded. * * @return */ - public boolean isExcludeAssigned(); + boolean isExcludeAssigned(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateResponseFormat.java index b9bda82..8b3f671 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateResponseFormat.java @@ -17,48 +17,47 @@ public interface IDeviceStateResponseFormat { * * @return */ - public Boolean getIncludeArea(); + Boolean getIncludeArea(); /** * Indicates if asset is included. * * @return */ - public Boolean getIncludeAsset(); + Boolean getIncludeAsset(); /** * Indicates if customer is included. * * @return */ - public Boolean getIncludeCustomer(); + Boolean getIncludeCustomer(); /** * Indicates if device is included. * * @return */ - public Boolean getIncludeDevice(); + Boolean getIncludeDevice(); /** * Indicates if device assignment is included. * * @return */ - public Boolean getIncludeDeviceAssignment(); + Boolean getIncludeDeviceAssignment(); /** * Indicates if device type is included. * * @return */ - public Boolean getIncludeDeviceType(); + Boolean getIncludeDeviceType(); /** * Indicates if event details is included. * * @return */ - public Boolean getIncludeEventDetails(); - + Boolean getIncludeEventDetails(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateSearchCriteria.java index b084d9c..67f41b1 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateSearchCriteria.java @@ -23,47 +23,47 @@ public interface IDeviceStateSearchCriteria extends ISearchCriteria { * * @return */ - public Date getLastInteractionDateBefore(); + Date getLastInteractionDateBefore(); /** * List of devices to be included in results. * * @return */ - public List getDeviceTokens(); + List getDeviceTokens(); /** * List of device assignments to be included in results. * * @return */ - public List getDeviceAssignmentTokens(); + List getDeviceAssignmentTokens(); /** * List of device types to be included in results. * * @return */ - public List getDeviceTypeTokens(); + List getDeviceTypeTokens(); /** * List of customers to be included in results. * * @return */ - public List getCustomerTokens(); + List getCustomerTokens(); /** * List of areas to be included in results. * * @return */ - public List getAreaTokens(); + List getAreaTokens(); /** * List of assets to be included in results. * * @return */ - public List getAssetTokens(); + List getAssetTokens(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStatusSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStatusSearchCriteria.java index 10acb9c..0f91ff4 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStatusSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStatusSearchCriteria.java @@ -19,12 +19,12 @@ public interface IDeviceStatusSearchCriteria extends ISearchCriteria { * * @return */ - public String getDeviceTypeToken(); + String getDeviceTypeToken(); /** * Limit results by code. * * @return */ - public String getCode(); + String getCode(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceTypeResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceTypeResponseFormat.java index e02de34..22fb94a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceTypeResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceTypeResponseFormat.java @@ -17,6 +17,5 @@ public interface IDeviceTypeResponseFormat { * * @return */ - public Boolean getIncludeAsset(); - + Boolean getIncludeAsset(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceTypeSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceTypeSearchCriteria.java index 16b1088..29ae59c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceTypeSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceTypeSearchCriteria.java @@ -13,5 +13,4 @@ * Criteria used for filtering device types. */ public interface IDeviceTypeSearchCriteria extends ISearchCriteria { - } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IZoneSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IZoneSearchCriteria.java index 31279d4..f2dc969 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IZoneSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IZoneSearchCriteria.java @@ -19,5 +19,5 @@ public interface IZoneSearchCriteria extends ISearchCriteria { * * @return */ - public String getAreaToken(); + String getAreaToken(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduleResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduleResponseFormat.java index 7d26574..e7e3d9a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduleResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduleResponseFormat.java @@ -11,5 +11,4 @@ * Determines which content is returned for schedule responses. */ public interface IScheduleResponseFormat { - } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduleSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduleSearchCriteria.java index 64e93fd..750e71e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduleSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduleSearchCriteria.java @@ -13,5 +13,4 @@ * Search criteria for Schedule. */ public interface IScheduleSearchCriteria extends ISearchCriteria { - } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduledJobResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduledJobResponseFormat.java index 78e33ff..557192e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduledJobResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduledJobResponseFormat.java @@ -17,5 +17,5 @@ public interface IScheduledJobResponseFormat { * * @return */ - public Boolean getIncludeContext(); + Boolean getIncludeContext(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduledJobSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduledJobSearchCriteria.java index 96b27b8..b323268 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduledJobSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduledJobSearchCriteria.java @@ -13,5 +13,4 @@ * Search criteria for Scheduled Job. */ public interface IScheduledJobSearchCriteria extends ISearchCriteria { - } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/tenant/ITenantSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/tenant/ITenantSearchCriteria.java index f1e20a1..77adb09 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/tenant/ITenantSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/tenant/ITenantSearchCriteria.java @@ -19,14 +19,14 @@ public interface ITenantSearchCriteria extends ISearchCriteria { * * @return */ - public String getTextSearch(); + String getTextSearch(); /** * Search for tenants for which the given user is authorized. * * @return */ - public String getUserId(); + String getUserId(); /** * Indicates whether runtime information should be included for the @@ -34,5 +34,5 @@ public interface ITenantSearchCriteria extends ISearchCriteria { * * @return */ - public boolean isIncludeRuntimeInfo(); + boolean isIncludeRuntimeInfo(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/system/IVersion.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/system/IVersion.java index 8df35e7..e078868 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/system/IVersion.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/system/IVersion.java @@ -19,40 +19,40 @@ public interface IVersion extends Serializable { * * @return */ - public String getEdition(); + String getEdition(); /** * Get the short identifier for edition. * * @return */ - public String getEditionIdentifier(); + String getEditionIdentifier(); /** * Gets the Maven version identifier. * * @return */ - public String getVersionIdentifier(); + String getVersionIdentifier(); /** * Gets the build timestamp. * * @return */ - public String getBuildTimestamp(); + String getBuildTimestamp(); /** * Gets the Git revision id. * * @return */ - public String getGitRevision(); + String getGitRevision(); /** * Gets the abbreviated version of the Git revision. * * @return */ - public String getGitRevisionAbbrev(); + String getGitRevisionAbbrev(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenant.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenant.java index 18a184c..c8d6aeb 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenant.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenant.java @@ -25,40 +25,40 @@ public interface ITenant extends IColorProvider, IIconProvider, IImageProvider, * * @return */ - public String getToken(); + String getToken(); /** * Get tenant name. * * @return */ - public String getName(); + String getName(); /** * Get token that devices pass to identify tenant. * * @return */ - public String getAuthenticationToken(); + String getAuthenticationToken(); /** * Get list of users authorized to access the tenant. * * @return */ - public List getAuthorizedUserIds(); + List getAuthorizedUserIds(); /** * Get id of template used to create tenant. * * @return */ - public String getConfigurationTemplateId(); + String getConfigurationTemplateId(); /** * Get id of dataset template used to populate tenant. * * @return */ - public String getDatasetTemplateId(); + String getDatasetTemplateId(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/request/ITenantCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/request/ITenantCreateRequest.java index 68e39f2..d315623 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/request/ITenantCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/request/ITenantCreateRequest.java @@ -26,40 +26,40 @@ public interface ITenantCreateRequest * * @return */ - public String getToken(); + String getToken(); /** * Get tenant name. * * @return */ - public String getName(); + String getName(); /** * Get token that devices pass to identify tenant. * * @return */ - public String getAuthenticationToken(); + String getAuthenticationToken(); /** * Get list of users authorized to access the tenant. * * @return */ - public List getAuthorizedUserIds(); + List getAuthorizedUserIds(); /** * Get id of configuration template used for tenant. * * @return */ - public String getConfigurationTemplateId(); + String getConfigurationTemplateId(); /** * Get id of dataset template used to populate tenant. * * @return */ - public String getDatasetTemplateId(); + String getDatasetTemplateId(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IGrantedAuthority.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IGrantedAuthority.java index 58be279..8fe9686 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IGrantedAuthority.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IGrantedAuthority.java @@ -19,26 +19,26 @@ public interface IGrantedAuthority extends Serializable { * * @return */ - public String getAuthority(); + String getAuthority(); /** * Get the description. * * @return */ - public String getDescription(); + String getDescription(); /** * Get parent authority. * * @return */ - public String getParent(); + String getParent(); /** * Indicates if the authority is a group. * * @return */ - public boolean isGroup(); + boolean isGroup(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java index 01aa25d..34b7f03 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java @@ -22,47 +22,47 @@ public interface IUser extends IPersistentEntity { * * @return */ - public String getUsername(); + String getUsername(); /** * Get the password. * * @return */ - public String getHashedPassword(); + String getHashedPassword(); /** * Get the common name. * * @return */ - public String getFirstName(); + String getFirstName(); /** * Get the surname. * * @return */ - public String getLastName(); + String getLastName(); /** * Get the last login date. * * @return */ - public Date getLastLogin(); + Date getLastLogin(); /** * Get the account status. * * @return */ - public AccountStatus getStatus(); + AccountStatus getStatus(); /** * Get the list of granted authorities. * * @return */ - public List getAuthorities(); + List getAuthorities(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IGrantedAuthorityCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IGrantedAuthorityCreateRequest.java index bb6fd5d..f10bb46 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IGrantedAuthorityCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IGrantedAuthorityCreateRequest.java @@ -19,26 +19,26 @@ public interface IGrantedAuthorityCreateRequest extends Serializable { * * @return */ - public String getAuthority(); + String getAuthority(); /** * Get the description. * * @return */ - public String getDescription(); + String getDescription(); /** * Get parent authority. * * @return */ - public String getParent(); + String getParent(); /** * Indicates if the authority is a group. * * @return */ - public boolean isGroup(); + boolean isGroup(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java index f9153e4..6351c95 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java @@ -22,40 +22,40 @@ public interface IUserCreateRequest extends IPersistentEntityCreateRequest { * * @return */ - public String getUsername(); + String getUsername(); /** * Get the password. * * @return */ - public String getPassword(); + String getPassword(); /** * Get the common name. * * @return */ - public String getFirstName(); + String getFirstName(); /** * Get the surname. * * @return */ - public String getLastName(); + String getLastName(); /** * Get the account status. * * @return */ - public AccountStatus getStatus(); + AccountStatus getStatus(); /** * Get the list of granted authorities. * * @return */ - public List getAuthorities(); + List getAuthorities(); } \ No newline at end of file From a2bddb0f7d2ba434feac324b180d33d752f2d9a4 Mon Sep 17 00:00:00 2001 From: jbaezml Date: Wed, 1 Jul 2020 09:03:07 -0300 Subject: [PATCH 12/48] Add authorities in the role --- .../java/com/sitewhere/rest/model/user/Role.java | 16 ++++++++++++++++ .../model/user/request/RoleCreateRequest.java | 15 +++++++++++++++ .../main/java/com/sitewhere/spi/user/IRole.java | 8 ++++++++ .../spi/user/request/IRoleCreateRequest.java | 4 +++- 4 files changed, 42 insertions(+), 1 deletion(-) diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/Role.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/Role.java index 1e09d0e..3f7ea0a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/Role.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/Role.java @@ -11,6 +11,9 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.sitewhere.spi.user.IRole; +import java.util.ArrayList; +import java.util.List; + /** * Model object for a rol. */ @@ -26,6 +29,9 @@ public class Role implements IRole { /** Description */ private String description; + /** List of granted authorities */ + private List authorities = new ArrayList<>(); + @Override public String getRole() { return this.role; @@ -36,6 +42,11 @@ public String getDescription() { return this.description; } + @Override + public List getAuthorities() { + return this.authorities; + } + public void setRole(String role) { this.role = role; } @@ -44,6 +55,10 @@ public void setDescription(String description) { this.description = description; } + public void setAuthorities(List authorities) { + this.authorities = authorities; + } + /** * Copy contents from the SPI class. * @@ -54,6 +69,7 @@ public static Role copy(IRole input) { Role result = new Role(); result.setRole(input.getRole()); result.setDescription(input.getDescription()); + result.setAuthorities(input.getAuthorities()); return result; } } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/RoleCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/RoleCreateRequest.java index 6c96999..d19ca8c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/RoleCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/RoleCreateRequest.java @@ -10,6 +10,9 @@ import com.sitewhere.spi.user.request.IGrantedAuthorityCreateRequest; import com.sitewhere.spi.user.request.IRoleCreateRequest; +import java.util.ArrayList; +import java.util.List; + /** * Default implementation of {@link IGrantedAuthorityCreateRequest} for use in * REST services. @@ -25,6 +28,9 @@ public class RoleCreateRequest implements IRoleCreateRequest { /** Description of the authority */ private String description; + /** List of granted authorities */ + private List authorities = new ArrayList<>(); + /* * @see * com.sitewhere.spi.user.request.IRoleCreateRequest#getRole() @@ -46,7 +52,16 @@ public void setRole(String role) { return this.description; } + @Override + public List getAuthorities() { + return this.authorities; + } + public void setDescription(String description) { this.description = description; } + + public void setAuthorities(List authorities) { + this.authorities = authorities; + } } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRole.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRole.java index a10f4af..76e92a3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRole.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRole.java @@ -8,6 +8,7 @@ package com.sitewhere.spi.user; import java.io.Serializable; +import java.util.List; /** * Interface for granted authority information. @@ -27,4 +28,11 @@ public interface IRole extends Serializable { * @return */ public String getDescription(); + + /** + * Get the list of granted authorities. + * + * @return + */ + public List getAuthorities(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IRoleCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IRoleCreateRequest.java index cf495d1..c12bfa3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IRoleCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IRoleCreateRequest.java @@ -8,6 +8,7 @@ package com.sitewhere.spi.user.request; import java.io.Serializable; +import java.util.List; /** * Interface for arguments needed to create a role @@ -29,8 +30,9 @@ public interface IRoleCreateRequest extends Serializable { public String getDescription(); /** - * Get parent authority. + * Get the list of granted authorities. * * @return */ + public List getAuthorities(); } \ No newline at end of file From f24ffafc96e01075bdd37704d67076104edb06b0 Mon Sep 17 00:00:00 2001 From: jbaezml Date: Wed, 1 Jul 2020 09:51:47 -0300 Subject: [PATCH 13/48] Add authorities in the role --- .../com/sitewhere/rest/model/user/Role.java | 7 ++-- .../com/sitewhere/rest/model/user/User.java | 32 ++++++------------- .../java/com/sitewhere/spi/user/IRole.java | 2 +- .../java/com/sitewhere/spi/user/IUser.java | 9 +----- 4 files changed, 16 insertions(+), 34 deletions(-) diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/Role.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/Role.java index 3f7ea0a..cf93b07 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/Role.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/Role.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.sitewhere.spi.user.IGrantedAuthority; import com.sitewhere.spi.user.IRole; import java.util.ArrayList; @@ -30,7 +31,7 @@ public class Role implements IRole { private String description; /** List of granted authorities */ - private List authorities = new ArrayList<>(); + private List authorities = new ArrayList<>(); @Override public String getRole() { @@ -43,7 +44,7 @@ public String getDescription() { } @Override - public List getAuthorities() { + public List getAuthorities() { return this.authorities; } @@ -55,7 +56,7 @@ public void setDescription(String description) { this.description = description; } - public void setAuthorities(List authorities) { + public void setAuthorities(List authorities) { this.authorities = authorities; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java index d90ab25..8a63968 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java @@ -7,19 +7,20 @@ */ package com.sitewhere.rest.model.user; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.sitewhere.rest.model.common.PersistentEntity; import com.sitewhere.spi.SiteWhereException; import com.sitewhere.spi.user.AccountStatus; +import com.sitewhere.spi.user.IRole; import com.sitewhere.spi.user.IUser; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + /** * Model class for a User. */ @@ -51,7 +52,7 @@ public class User extends PersistentEntity implements IUser { private List authorities = new ArrayList<>(); /** List of roles */ - private List roles = new ArrayList<>(); + private List roles = new ArrayList<>(); /* * @see com.sitewhere.spi.user.IUser#getUsername() @@ -126,27 +127,15 @@ public void setStatus(AccountStatus status) { this.status = status; } - /* - * @see com.sitewhere.spi.user.IUser#getAuthorities() - */ - @Override - public List getAuthorities() { - return authorities; - } - - public void setAuthorities(List authorities) { - this.authorities = authorities; - } - /* * @see com.sitewhere.spi.user.IUser#getRoles() */ @Override - public List getRoles() { + public List getRoles() { return roles; } - public void setRoles(List roles) { + public void setRoles(List roles) { this.roles = roles; } @@ -164,8 +153,7 @@ public static User copy(IUser input) throws SiteWhereException { result.setLastName(input.getLastName()); result.setLastLogin(input.getLastLogin()); result.setStatus(input.getStatus()); - result.setAuthorities(new ArrayList(input.getAuthorities())); - result.setRoles(new ArrayList(input.getRoles())); + result.setRoles(new ArrayList<>(input.getRoles())); PersistentEntity.copy(input, result); return result; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRole.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRole.java index 76e92a3..d764822 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRole.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRole.java @@ -34,5 +34,5 @@ public interface IRole extends Serializable { * * @return */ - public List getAuthorities(); + public List getAuthorities(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java index d125610..9bc8a78 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java @@ -59,17 +59,10 @@ public interface IUser extends IPersistentEntity { */ public AccountStatus getStatus(); - /** - * Get the list of granted authorities. - * - * @return - */ - public List getAuthorities(); - /** * Get the list roles. * * @return */ - public List getRoles(); + public List getRoles(); } \ No newline at end of file From 9769ecd68464ceaf983f889ae1b0215567f88062 Mon Sep 17 00:00:00 2001 From: jbaezml Date: Wed, 1 Jul 2020 12:34:58 -0300 Subject: [PATCH 14/48] Add role enum --- .../com/sitewhere/spi/user/SiteWhereRole.java | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java new file mode 100644 index 0000000..ec9f1c1 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java @@ -0,0 +1,40 @@ +package com.sitewhere.spi.user; + +import java.util.Arrays; +import java.util.List; + +public enum SiteWhereRole { + REST("ROLE_REST", Arrays.asList(SiteWhereAuthority.REST)), + ADMIN_CONSOLE("ROLE_ADMIN_CONSOLE",Arrays.asList(SiteWhereAuthority.AdminConsole)), + VIEW_SERVER_INFO("ROLE_VIEW_SERVER_INFO", Arrays.asList(SiteWhereAuthority.ViewServerInfo)), + ADMINISTER_USERS("ROLE_ADMINISTER_USERS",Arrays.asList(SiteWhereAuthority.AdminUsers)), + ADMINISTER_USER_SELF("ROLE_ADMINISTER_USER_SELF",Arrays.asList(SiteWhereAuthority.AdminSelf)), + ADMINISTER_TENANTS("ROLE_ADMINISTER_TENANTS",Arrays.asList(SiteWhereAuthority.AdminTenants)), + ADMINISTER_TENANT_SELF("ROLE_ADMINISTER_TENANT_SELF",Arrays.asList(SiteWhereAuthority.AdminOwnTenant)); + + private String roleName; + private List authorities; + + public String getRoleName() { + return roleName; + } + + public List getAuthorities() { + return authorities; + } + + SiteWhereRole(final String roleName, final List authorities) { + this.roleName = roleName; + this.authorities = authorities; + } + + public static List getAuthoritiesByRoleName(String roleName){ + for(SiteWhereRole v : values()){ + if( v.getRoleName().equalsIgnoreCase(roleName)){ + return v.getAuthorities(); + } + } + + throw new IllegalStateException(String.format("Unsupported role %s.", roleName)); + } +} From 7e7f0b832d1a03a4aa53b0ec3b9f221dc7ddc941 Mon Sep 17 00:00:00 2001 From: Luciano Baez Date: Wed, 1 Jul 2020 12:38:11 -0300 Subject: [PATCH 15/48] delete authorizations from the request to create user --- .../rest/model/user/request/UserCreateRequest.java | 12 ------------ .../spi/user/request/IUserCreateRequest.java | 7 ------- 2 files changed, 19 deletions(-) diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java index b357bb6..d8964ac 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java @@ -118,16 +118,4 @@ public List getRoles() { public void setRoles(List roles) { this.roles = roles; } - - /* - * @see com.sitewhere.spi.user.request.IUserCreateRequest#getAuthorities() - */ - @Override - public List getAuthorities() { - return Collections.unmodifiableList(this.authorities); - } - - public void setAuthorities(List authorities) { - this.authorities = authorities; - } } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java index f04ea4b..f07dfff 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java @@ -58,11 +58,4 @@ public interface IUserCreateRequest extends IPersistentEntityCreateRequest { * @return */ public List getRoles(); - - /** - * Get the list of granted authorities. - * - * @return - */ - public List getAuthorities(); } \ No newline at end of file From 9828d663d29a86c66e2d938961a6110e36541073 Mon Sep 17 00:00:00 2001 From: Luciano Baez Date: Wed, 1 Jul 2020 14:59:40 -0300 Subject: [PATCH 16/48] delete authorizations from the request to create user --- .../sitewhere/rest/model/user/request/UserCreateRequest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java index d8964ac..d7a69df 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java @@ -44,9 +44,6 @@ public class UserCreateRequest extends PersistentEntityCreateRequest implements /** User authorities */ private List roles; - /** User authorities */ - private List authorities; - /* * @see com.sitewhere.spi.user.request.IUserCreateRequest#getUsername() */ From 93f090b59250b0b985eb16fd86b433c3fbf3e2fd Mon Sep 17 00:00:00 2001 From: Luciano Baez Date: Fri, 3 Jul 2020 17:14:08 -0300 Subject: [PATCH 17/48] Delete authorities in user model. --- .../com/sitewhere/rest/model/user/User.java | 5 ++-- .../com/sitewhere/spi/user/SiteWhereRole.java | 29 ++++++++++++++----- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java index 8a63968..ef1e385 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java @@ -8,6 +8,7 @@ package com.sitewhere.rest.model.user; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.sitewhere.rest.model.common.PersistentEntity; @@ -48,10 +49,8 @@ public class User extends PersistentEntity implements IUser { /** Account status */ private AccountStatus status; - /** List of granted authorities */ - private List authorities = new ArrayList<>(); - /** List of roles */ + @JsonIgnore private List roles = new ArrayList<>(); /* diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java index ec9f1c1..a9468df 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java @@ -1,30 +1,43 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ package com.sitewhere.spi.user; import java.util.Arrays; import java.util.List; public enum SiteWhereRole { - REST("ROLE_REST", Arrays.asList(SiteWhereAuthority.REST)), - ADMIN_CONSOLE("ROLE_ADMIN_CONSOLE",Arrays.asList(SiteWhereAuthority.AdminConsole)), - VIEW_SERVER_INFO("ROLE_VIEW_SERVER_INFO", Arrays.asList(SiteWhereAuthority.ViewServerInfo)), - ADMINISTER_USERS("ROLE_ADMINISTER_USERS",Arrays.asList(SiteWhereAuthority.AdminUsers)), - ADMINISTER_USER_SELF("ROLE_ADMINISTER_USER_SELF",Arrays.asList(SiteWhereAuthority.AdminSelf)), - ADMINISTER_TENANTS("ROLE_ADMINISTER_TENANTS",Arrays.asList(SiteWhereAuthority.AdminTenants)), - ADMINISTER_TENANT_SELF("ROLE_ADMINISTER_TENANT_SELF",Arrays.asList(SiteWhereAuthority.AdminOwnTenant)); + REST("ROLE_REST","", Arrays.asList(SiteWhereAuthority.REST)), + ADMIN_CONSOLE("ROLE_ADMIN_CONSOLE","",Arrays.asList(SiteWhereAuthority.AdminConsole)), + VIEW_SERVER_INFO("ROLE_VIEW_SERVER_INFO","", Arrays.asList(SiteWhereAuthority.ViewServerInfo)), + ADMINISTER_USERS("ROLE_ADMINISTER_USERS","",Arrays.asList(SiteWhereAuthority.AdminUsers)), + ADMINISTER_USER_SELF("ROLE_ADMINISTER_USER_SELF","",Arrays.asList(SiteWhereAuthority.AdminSelf)), + ADMINISTER_TENANTS("ROLE_ADMINISTER_TENANTS","",Arrays.asList(SiteWhereAuthority.AdminTenants)), + ADMINISTER_TENANT_SELF("ROLE_ADMINISTER_TENANT_SELF","",Arrays.asList(SiteWhereAuthority.AdminOwnTenant)); private String roleName; + private String description; private List authorities; public String getRoleName() { return roleName; } + public String getDescription() { + return description; + } + public List getAuthorities() { return authorities; } - SiteWhereRole(final String roleName, final List authorities) { + SiteWhereRole(final String roleName, String description, final List authorities) { this.roleName = roleName; + this.description = description; this.authorities = authorities; } From 7f4374059fbb876873d9ebd2f4e898b41f6d87b6 Mon Sep 17 00:00:00 2001 From: Luciano Baez Date: Mon, 6 Jul 2020 18:20:33 -0300 Subject: [PATCH 18/48] add authorizations to roles and roles to users --- .../src/main/java/com/sitewhere/spi/user/SiteWhereRole.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java index a9468df..f86123e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java @@ -9,6 +9,7 @@ import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; public enum SiteWhereRole { REST("ROLE_REST","", Arrays.asList(SiteWhereAuthority.REST)), @@ -31,6 +32,11 @@ public String getDescription() { return description; } + public List getAuthoritiesAsStringList() { + List authorities = this.authorities.stream().map(auth -> auth.getName()).collect(Collectors.toList()); + return authorities; + } + public List getAuthorities() { return authorities; } From e848679decc88daeecdba1a264ce68e9a974df12 Mon Sep 17 00:00:00 2001 From: Luciano Baez Date: Tue, 7 Jul 2020 18:10:27 -0300 Subject: [PATCH 19/48] refactor code --- .../rest/model/user/request/RoleCreateRequest.java | 4 +--- .../java/com/sitewhere/spi/user/SiteWhereRole.java | 14 +++++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/RoleCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/RoleCreateRequest.java index d19ca8c..dd88410 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/RoleCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/RoleCreateRequest.java @@ -6,15 +6,13 @@ * LICENSE.txt file. */ package com.sitewhere.rest.model.user.request; - -import com.sitewhere.spi.user.request.IGrantedAuthorityCreateRequest; import com.sitewhere.spi.user.request.IRoleCreateRequest; import java.util.ArrayList; import java.util.List; /** - * Default implementation of {@link IGrantedAuthorityCreateRequest} for use in + * Default implementation of {@link IRoleCreateRequest} for use in * REST services. */ public class RoleCreateRequest implements IRoleCreateRequest { diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java index f86123e..bb7cdc7 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java @@ -12,13 +12,13 @@ import java.util.stream.Collectors; public enum SiteWhereRole { - REST("ROLE_REST","", Arrays.asList(SiteWhereAuthority.REST)), - ADMIN_CONSOLE("ROLE_ADMIN_CONSOLE","",Arrays.asList(SiteWhereAuthority.AdminConsole)), - VIEW_SERVER_INFO("ROLE_VIEW_SERVER_INFO","", Arrays.asList(SiteWhereAuthority.ViewServerInfo)), - ADMINISTER_USERS("ROLE_ADMINISTER_USERS","",Arrays.asList(SiteWhereAuthority.AdminUsers)), - ADMINISTER_USER_SELF("ROLE_ADMINISTER_USER_SELF","",Arrays.asList(SiteWhereAuthority.AdminSelf)), - ADMINISTER_TENANTS("ROLE_ADMINISTER_TENANTS","",Arrays.asList(SiteWhereAuthority.AdminTenants)), - ADMINISTER_TENANT_SELF("ROLE_ADMINISTER_TENANT_SELF","",Arrays.asList(SiteWhereAuthority.AdminOwnTenant)); + REST("ROLE_REST","REST services access", Arrays.asList(SiteWhereAuthority.REST)), + ADMIN_CONSOLE("ROLE_ADMIN_CONSOLE","Administrative console login",Arrays.asList(SiteWhereAuthority.AdminConsole)), + VIEW_SERVER_INFO("ROLE_VIEW_SERVER_INFO","View global server information", Arrays.asList(SiteWhereAuthority.ViewServerInfo)), + ADMINISTER_USERS("ROLE_ADMINISTER_USERS","Administer all users",Arrays.asList(SiteWhereAuthority.AdminUsers)), + ADMINISTER_USER_SELF("ROLE_ADMINISTER_USER_SELF","Administer own user profile",Arrays.asList(SiteWhereAuthority.AdminSelf)), + ADMINISTER_TENANTS("ROLE_ADMINISTER_TENANTS","Administer all tenants",Arrays.asList(SiteWhereAuthority.AdminTenants)), + ADMINISTER_TENANT_SELF("ROLE_ADMINISTER_TENANT_SELF","Administer own tenant",Arrays.asList(SiteWhereAuthority.AdminOwnTenant)); private String roleName; private String description; From b5660c329158961f13f644a22ce18add8714b2b4 Mon Sep 17 00:00:00 2001 From: Luciano Baez Date: Wed, 8 Jul 2020 18:00:54 -0300 Subject: [PATCH 20/48] update test --- .../java/com/sitewhere/rest/client/user/UserRestTests.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java index 1efb91f..9b34262 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java @@ -13,6 +13,7 @@ import java.util.ArrayList; import java.util.List; +import com.sitewhere.spi.user.SiteWhereRole; import org.junit.Test; import com.sitewhere.rest.client.AbstractCRUDRestClientTests; @@ -87,9 +88,9 @@ protected UserCreateRequest buildUpdateRequest(String token) throws SiteWhereExc request.setStatus(AccountStatus.Active); request.setUsername(JOHN_DOE_USERNAME); request.setPassword("12345"); - List authorities = new ArrayList(); - authorities.add("GRP_SERVER"); - request.setRoles(authorities); + List roles = new ArrayList(); + roles.add(SiteWhereRole.ADMINISTER_TENANTS.getRoleName()); + request.setRoles(roles); return request; } From 41c252dbe9352508455ebd91d0b0834030078779 Mon Sep 17 00:00:00 2001 From: jorgevillaverde-sitewhere Date: Thu, 9 Jul 2020 15:37:24 -0300 Subject: [PATCH 21/48] chore: prepare for beta3 --- build.gradle | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 802f333..cee6f67 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,5 @@ buildscript { repositories { - mavenLocal() maven { url "https://plugins.gradle.org/m2/" } } dependencies { @@ -12,41 +11,40 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.beta1-luciano' - + version = '3.0.0.beta3' + repositories { - mavenLocal() maven { url "https://repo.maven.apache.org/maven2" } } } subprojects { apply plugin: 'eclipse' - + apply plugin: "com.github.hierynomus.license" license { header rootProject.file('HEADER') include "**/*.java" } - + // Choose Java settings. apply plugin: 'java' sourceCompatibility = 1.8 targetCompatibility = 1.8 - + tasks.withType(Javadoc) { options.addStringOption('Xdoclint:none', '-quiet') options.addStringOption('encoding', 'UTF-8') options.addStringOption('charSet', 'UTF-8') } - + // Common dependencies used for all projects. dependencies { compile platform('io.quarkus:quarkus-bom:1.2.1.Final') - + testCompile group: 'junit', name: 'junit' } test { exclude '**/*' } -} +} \ No newline at end of file From d226cd4cee90aeedd4171d7dbdf242ddd89f96ad Mon Sep 17 00:00:00 2001 From: jorgevillaverde-sitewhere Date: Thu, 9 Jul 2020 15:41:14 -0300 Subject: [PATCH 22/48] chore: rollback build.gradle. --- gradle.properties | 8 +- sitewhere-java-client/build.gradle | 22 +++-- sitewhere-java-model/build.gradle | 127 ++++++++++++++++------------- 3 files changed, 90 insertions(+), 67 deletions(-) diff --git a/gradle.properties b/gradle.properties index dc60c22..f30b096 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -#nexusUsername=yourusername -#nexusPassword=yourpassword -#nexusUrl=https://oss.sonatype.org/content/repositories/snapshots/ -#nexusUrl=https://oss.sonatype.org/service/local/staging/deploy/maven2 +nexusUsername=yourusername +nexusPassword=yourpassword +nexusUrl=https://oss.sonatype.org/content/repositories/snapshots/ +nexusUrl=https://oss.sonatype.org/service/local/staging/deploy/maven2 diff --git a/sitewhere-java-client/build.gradle b/sitewhere-java-client/build.gradle index a8fc7d5..ee5e859 100644 --- a/sitewhere-java-client/build.gradle +++ b/sitewhere-java-client/build.gradle @@ -3,12 +3,12 @@ description = 'SiteWhere Java Client' apply plugin: 'java' dependencies { compile project(':sitewhere-java-model') - + // Android-compatible REST support. compile group: 'com.squareup.retrofit2', name: 'retrofit', version:'2.5.0' compile group: 'com.squareup.retrofit2', name: 'converter-jackson', version:'2.5.0' compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.12.0' - + testCompile group: 'org.apache.activemq', name: 'activemq-all', version:'5.10.0' } @@ -26,7 +26,7 @@ task javadocJar(type: Jar) { classifier = 'javadoc' } -// Publish jar. +// Publish jar. apply plugin: 'maven-publish' publishing { publications { @@ -55,11 +55,23 @@ publishing { connection = 'https://github.com/sitewhere/sitewhere-java-api.git' url = 'https://github.com/sitewhere/sitewhere-java-api' } - } + } } } repositories { - mavenLocal() + maven { + url project.nexusUrl + credentials { + username project.nexusUsername + password project.nexusPassword + } + } } } +apply plugin: 'signing' +signing { + sign publishing.publications.mavenJava +} + + diff --git a/sitewhere-java-model/build.gradle b/sitewhere-java-model/build.gradle index 851661b..ae20055 100644 --- a/sitewhere-java-model/build.gradle +++ b/sitewhere-java-model/build.gradle @@ -1,58 +1,69 @@ -description = 'SiteWhere Java Model' - -apply plugin: 'java' -dependencies { - // Jackson JSON processing. - compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind' - compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations' - - // Date/time conversions. - compile group: 'joda-time', name: 'joda-time', version:'2.9.1' -} - -task sourcesJar(type: Jar) { - from sourceSets.main.allJava - classifier = 'sources' -} - -task javadocJar(type: Jar) { - from javadoc - classifier = 'javadoc' -} - -// Publish jar. -apply plugin: 'maven-publish' -publishing { - publications { - mavenJava(MavenPublication) { - from components.java - artifact sourcesJar - artifact javadocJar - pom { - name = 'SiteWhere Java Model' - description = 'SiteWhere Java Model and REST Client' - url = 'http://sitewhere.io' - licenses { - license { - name = 'CPAL-1.0' - url = 'https://opensource.org/licenses/CPAL-1.0' - } - } - developers { - developer { - id = 'admin' - name = 'SiteWhere Admin' - email = 'admin@sitewhere.com' - } - } - scm { - connection = 'https://github.com/sitewhere/sitewhere-java-api.git' - url = 'https://github.com/sitewhere/sitewhere-java-api' - } - } - } - } - repositories { - mavenLocal() - } -} +description = 'SiteWhere Java Model' + +apply plugin: 'java' +dependencies { + // Jackson JSON processing. + compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind' + compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations' + + // Date/time conversions. + compile group: 'joda-time', name: 'joda-time', version:'2.9.1' +} + +task sourcesJar(type: Jar) { + from sourceSets.main.allJava + classifier = 'sources' +} + +task javadocJar(type: Jar) { + from javadoc + classifier = 'javadoc' +} + +// Publish jar. +apply plugin: 'maven-publish' +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + artifact sourcesJar + artifact javadocJar + pom { + name = 'SiteWhere Java Model' + description = 'SiteWhere Java Model and REST Client' + url = 'http://sitewhere.io' + licenses { + license { + name = 'CPAL-1.0' + url = 'https://opensource.org/licenses/CPAL-1.0' + } + } + developers { + developer { + id = 'admin' + name = 'SiteWhere Admin' + email = 'admin@sitewhere.com' + } + } + scm { + connection = 'https://github.com/sitewhere/sitewhere-java-api.git' + url = 'https://github.com/sitewhere/sitewhere-java-api' + } + } + } + } + repositories { + maven { + url project.nexusUrl + credentials { + username project.nexusUsername + password project.nexusPassword + } + } + } +} + +apply plugin: 'signing' +signing { + sign publishing.publications.mavenJava +} From 1800a31f5d44b35015b06b763bae821d96d0cd54 Mon Sep 17 00:00:00 2001 From: jorgevillaverde-sitewhere Date: Thu, 9 Jul 2020 15:43:18 -0300 Subject: [PATCH 23/48] chore: gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f30b096..5c8f28c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ nexusUsername=yourusername nexusPassword=yourpassword -nexusUrl=https://oss.sonatype.org/content/repositories/snapshots/ +#nexusUrl=https://oss.sonatype.org/content/repositories/snapshots/ nexusUrl=https://oss.sonatype.org/service/local/staging/deploy/maven2 From 9178c73fac35a9643a0aff5039a37953b72b3c60 Mon Sep 17 00:00:00 2001 From: jorgevillaverde-sitewhere Date: Thu, 9 Jul 2020 16:13:18 -0300 Subject: [PATCH 24/48] add gradlew and travis-ci --- .travis.yml | 8 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 56177 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 172 +++++++++++++++++++++++ gradlew.bat | 84 +++++++++++ 5 files changed, 269 insertions(+) create mode 100644 .travis.yml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..79846f9 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,8 @@ +sudo: false +dist: trusty +language: java +jdk: +- openjdk8 + +script: +- ./gradlew check diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..29953ea141f55e3b8fc691d31b5ca8816d89fa87 GIT binary patch literal 56177 zcmagFV{~WVwk?_pE4FRhwr$(CRk3Z`c2coz+fFL^#m=jD_df5v|GoR1_hGCxKaAPt z?5)i;2YO!$(jcHHKtMl#0s#RD{xu*V;Q#dm0)qVemK9YIq?MEtqXz*}_=jUJ`nb5z zUkCNS_ILXK>nJNICn+YXtU@O%b}u_MDI-lwHxDaKOEoh!+oZ&>#JqQWH$^)pIW0R) zElKkO>LS!6^{7~jvK^hY^r+ZqY@j9c3=``N6W|1J`tiT5`FENBXLF!`$M#O<|Hr=m zzdq3a_Az%dG_f)LA6=3E>FVxe=-^=L^nXkt;*h0g0|Nr0hXMkk{m)Z`?Co8gUH;CO zHMF!-b}@8vF?FIdwlQ>ej#1NgUlc?5LYq`G68Sj-$su4QLEuKmR+5|=T>6WUWDgWe zxE!*C;%NhMOo?hz$E$blz1#Poh2GazA4f~>{M`DT`i=e#G$*Bc4?Fwhs9KG=iTU1_ znfp#3-rpN&56JH)Q82UMm6+B@cJwQOmm^!avj=B5n8}b6-%orx(1!3RBhL~LO~Q_) z08-2}(`c{;%({toq#^5eD&g&LhE&rdu6Xo6?HW)dn#nW17y(4VDNRo}2Tz*KZeOJ=Gqg{aO>;;JnlqFiMVA+byk#lYskJf)bJ=Q) z8Z9b3bI9$rE-t9r5=Uhh={6sj%B;jj)M&G`lVH9Y*O*|2Qx{g3u&tETV~m)LwKEm7 zT}U%CvR7RA&X0<;L?i24Vi<+zU^$IbDbi|324Qk)pPH={pEwumUun5Zs*asDRPM8b z5ubzmua81PTymsv=oD9C!wsc%ZNy20pg(ci)Tela^>YG-p}A()CDp}KyJLp7^&ZEd z**kfem_(nl!mG9(IbD|-i?9@BbLa{R>y-AA+MIlrS7eH44qYo%1exzFTa1p>+K&yc z<5=g{WTI8(vJWa!Sw-MdwH~r;vJRyX}8pFLp7fEWHIe2J+N;mJkW0t*{qs_wO51nKyo;a zyP|YZy5it}{-S^*v_4Sp4{INs`_%Apd&OFg^iaJ;-~2_VAN?f}sM9mX+cSn-j1HMPHM$PPC&s>99#34a9HUk3;Bwf6BZG%oLAS*cq*)yqNs=7}gqn^ZKvuW^kN+x2qym zM_7hv4BiTDMj#<>Ax_0g^rmq=`4NbKlG1@CWh%_u&rx`9Xrlr0lDw zf}|C`$ey5IS3?w^Y#iZ!*#khIx8Vm+0msFN>$B~cD~;%#iqV|mP#EHY@t_VV77_@I zK@x`ixdjvu=j^jTc%;iiW`jIptKpX09b9LV{(vPu1o0LcG)50H{Wg{1_)cPq9rH+d zP?lSPp;sh%n^>~=&T533yPxuXFcTNvT&eGl9NSt8qTD5{5Z`zt1|RV%1_>;odK2QV zT=PT^2>(9iMtVP==YMXX#=dxN{~Z>=I$ob}1m(es=ae^3`m5f}C~_YbB#3c1Bw&3lLRp(V)^ZestV)Xe{Yk3^ijWw@xM16StLG)O zvCxht23Raf)|5^E3Mjt+b+*U7O%RM$fX*bu|H5E{V^?l_z6bJ8jH^y2J@9{nu)yCK z$MXM!QNhXH!&A`J#lqCi#nRZ&#s1&1CPi7-9!U^|7bJPu)Y4J4enraGTDP)ssm_9d z4Aj_2NG8b&d9jRA#$ehl3??X9-{c^vXH5**{}=y+2ShoNl-71whx;GS=a~*?bN{cm zCy+j0p4J4h{?MSnkQ5ZV4UJ(fs7p#3tmo7i*sWH?FmuDj0o>4|CIYAj=g@ZbEmMgl z6J-XPr67r}Ke$)WkD)hVD2|tn{e!x-z)koN$iH!2AUD0#&3&3g8mHKMr%iUusrnOd>R?l~q-#lr2Ki zb)XkR$bT5#or!s~fN5(K@`VL)5=CrQDiLQE;KrxvC78a+BXkAL$!KCJ3m1g%n4o4Z z@+*qk1bK{*U#?bZ$>8-Syw@3dG~GF=)-`%bU56v^)3b7`EW+tkkrSA?osI4}*~X?i zWO^kL8*xM{x-Ix}u=$wq8=Nl5bzHhAT)N&dg{HA$_n!ys67s~R1r7)(4i^ZB@P9sF z|N4Y-G$9R8Rz1J`EL)hhVuCdsX)!cl)`ZIXF>D+$NazAcg3$y)N1g~`ibIxbdAOtE zb2!M7*~GEENaTc+x#hOFY_n0y3`1mnNGu&QTmNh~%X$^tdi_4%ZjQk{_O^$=mcm|! z%xAxO*?qsc`IPrL?xgPmHAvEdG5A>rJ{Lo;-uQf3`5I~EC(PPgq2@n1Wc}lV&2O~t z1{|U92JH6zB?#yX!M`}Ojw+L1Z8{Is0pe?^ZxzOe_ZQcPCXnEVCy;+Yugc`E!nA(I z%O%hk_^!(IZso}h@Qe3{Fwl3nztZ$&ipk?FSr2Mo@18#FM^=PCyaDZ35%7gPt-%35 z$P4|4J8DnNH{_l_z@JQPY07;`(!M-{9j2=y__fxmbp59aaV4d)Y=@N(iUgGm0K!28 zMp;Ig3KkNy9z>t5BvQWtMY82$c}}d6;1`IJ^~At0(2|*C(NG#SWoa2rs|hBM8+HW(P5TMki>=KRlE+dThLZkdG387dOSY2X zWHr}5+)x`9lO#fSD1v&fL&wqU@b&THBot8Z?V;E4ZA$y42=95pP3iW)%$=UW_xC3; zB6t^^vl~v5csW5=aiZLZt9JLP*ph4~Q*l96@9!R8?{~a#m)tdNxFzQaeCgYIBA1+o+4UMmZoUO9z?Owi@Z=9VeCI6_ z7DV)=*v<&VRY|hWLdn^Ps=+L2+#Yg9#5mHcf*s8xp4nbrtT-=ju6wO976JQ(L+r=)?sfT?!(-}k!y?)>5c}?GB-zU zS*r8)PVsD;^aVhf^57tq(S%&9a;}F}^{ir}y0W|0G_=U9#W6y2FV}8NTpXJX*ivt{ zwQLhX0sSB8J?bmh(eUKq#AVmTO{VudFZpsIn-|i-8WlsexQ<;@WNn)OF=UpDJ7BI= z%-95NYqOY#)S?LIW-+rfw84@6Me}ya4*ltE*R^fy&W7?rEggZBxN@BR6=0!WH%4x0 zXg7=Ws|9Em`0pAt8k0cyQlr+>htn8GYs)+o>)IIf)p+yR`>lvz>5xFt(ep7>no4?4 zA%SUJ=L2D=;wq*f8WFl|&57Apa1;cT?b?bfJc8h&vkBvm%#ypP{=`6RL#Tf-dCq`;$!eR%>29EqpIkV*9 zEZl_>P3&}hY7)~q6UYw?*cBCsuPi$TU zRe}A|5nl7L_#e`8W0Hcpd~NWjAaV#3ngl$CoE3dz!= z?$3`dPgn5I+Q8 z@Bk>MqB7;kQqnDK=buPc+DsEDP-S;8#I(_z!*u&%_%nqI3+srxxsf9-Qg6%$l$Rtl zK2Wn-OtsBE5<1d}1Hl!l-r8eqD+{%b5$jfxQZw`2%)f+_^HMfbWyW4@j!^9M({>e; zeqCfR5b?^xh7MhHfmDvoXm8Wq;Jl2RU;jY*+a&o*H02$`#5HsG9#HOR4{g9 z#2mgNt%ep|IWrmctj=e%3xV&o^@8%OrR6io()6^sr!nQ3WIyQ3)0Mn}w}p^&t*V0G z03mUjJXbSCUG!o#-x*;_v>N8n-`yh1%Dp(1P)vz$^`oevMVh?u3}mgh}Qr(jhy;-09o$EB6jjWR!2F&xz^66M!F z-g}JBWLcw=j&Vb>xW#PQ3vICRT_UZ@wllScxk@ZQe&h-y)4B5kUJptVO%U-Ff3Hka zEyLldFsaM5E5`k>m}||+u`11;)tG@FL6TGzoF`A{R}?RZ@Ba!AS(tqAf{a_wtnlv>p|+&EEs(x%d4eq*RQ;Pq;) za9*J(n&C2dmFcNXb`WJi&XPu>t+m)Qp}c;$^35-Fj6soilnd4=b;ZePF27IdjE6PZ zvx{|&5tApKU2=ItX*ilhDx-a2SqQVjcV40Yn})Kaz$=$+3ZK~XXtrzTlKbR7C9)?2 zJ<^|JKX!eG231Oo=94kd1jC49mqE6G0x!-Qd}UkEm)API zKEemM1b4u_4LRq9IGE3e8XJq0@;%BCr|;BYW_`3R2H86QfSzzDg8eA>L)|?UEAc$< zaHY&MN|V#{!8}cryR+ygu!HI#$^;fxT|rmDE0zx|;V!ER3yW@09`p#zt}4S?Eoqx8 zk3FxI12)>eTd+c0%38kZdNwB`{bXeqO;vNI>F-l3O%-{`<3pNVdCdwqYsvso!Fw($ z`@$1&U=XH|%FFs>nq#e0tnS_jHVZLaEmnK#Ci==~Q!%Vr?{K0b$dSu(S!2VjZ}316b_I5Uk*L!8cJd>6W67+#0>-1P0i{eI%`C(_FkwRC zm}5eHEb0v^w3Wkqv#biSHXBG4yPC=^E!@hV8J5*JYf73=BqO!Ps#sP0fx~&C9PMN= z+V%$50uI|KE4^LCUXI74-qw$aRG&3kN-aOzVpRS1AX(Ua;Ewy>SlDn@lV(<^W?t-x z%K2iVK+;lG_~XF&Glk7w4<=Z!@-qDLc7)$q!>H^AU{s6e7krRmr!AZLf?8~$rRuP) zc$@c*PhIA^Lsu;uR{^x2)9nvsm}-67I`+iFZkhfNASUD>*LqxD=sAtpn{zY0xMxFp z4@USzYjMULeKc1lBe*8vxJDGNiSTtq_b#zd+Vzdc%$~+xf0;s|LR{F$YKe7YJVR$U}jKOo6=D+|6vnryopFbmNXEo-~I z*nm(LHmEGwkB%h%tXF4r|5h2p%VnRLx5rRsFpPR|e)*)C`WG-Iz94xsO&>1k8g6W? zG6#40`>I=B^scgmt_6!uU}=b3HgE@Jhj-X3jP!w-y>81ZD*~9C6ZRN4vlAFJQwK&l zP9&CP4%l-eN@0>Ihb_UWtp2kcPnh+L(fFJfQLc0`qqFbCkzr`8y2%{@RNrQbx*;tj zKtW!BWJFR$9(9^!Y%I%@3p?0zX#;(G?}sRkL{U>2rH4Wc{3{0@MV+vEaFcD18KIy% z7OyQTp?-N_)i%g+O#h(eLt_3ZDo)2l4PwjVS#=FzUNVvW{kFijz-@Y9-66fQL=xoc zXfLAC8<-!nnpM87K#eT;D^sW^HL5kS))Qj`kxT`%OewTXS(FT^X~VlkkZJJ?3*R8J zR>c>6)9K+9lg_a7!#<`KC$oEk-!~2N)@V}eq4O2xP)~N-lc}vH8qSe7tmQ3p@$pPde;Xk30uHYJ+VXeA@=yordN?7_ zpGsTlLlI{(qgtjOIlbx8DI{Nczj!*I>_-3ahzG;Kt&~8G_4G8qqF6IDn&g+zo>^L< z@zeVTB`{B9S*@M2_7@_(iHTQMCdC3zDi3_pE2!Lsg`K)$SiZj2X>=b2U#h^?x0j$Y zYuRf9vtRT~dxvF2Onn>?FfYPan1uc&eKyfBOK(|g7}E)t7}?{4GI%_KoO#8;_{N6! zDAqx7%0J`PG@O{(_)9yAFF!7l zWy1|Utdlc)^&J3OKhPI+S|Fc3R7vMVdN?PgoiQzo200oGpcy;TjSQ^e$a}Kh&C~xm zsG!Pqpqt5T`1`X$yas7{1hk?-r(Um>%&@?P2#NMETeQYhvk~nZW#BApGOLS2hdH)d zn!sf)7DotO?tRXBE#UpfKk-s}6%TfS0|7#>Rgk z%Np7ln*SH#6tzufY<0|UT+M}zJ1)1ap_cE@;QZp)+e-;k24 z3lZG_EA?tM$Eg|x3CK3!k`T7!*0}{fh8#=t^2EJ>TTo`6!CUm(HFUl7fFIB9Zlt4a z!4=|s-ZSn!@6Yc&+r1w*?*2fxKX>Hz2(vBwgE*>E=`A?Y1W-;{d2$4B%$NFAI?v5e zmYT{blxWeHn2J(0Vbz%FDz9~baqE#)R2TMG24xMZjCLcPfc1mR?5H4L%GnMR7ua{B zCu=nN(vV)5dJ_B80WBCy`tJ#YH6GyltGBSQvsN#q0;6XU1&60$&PC$0r}FUdr@1I+ zINcU{Ow6t4Qzmyk=A6u*z_!A*$^hBXJeKQ96bnF2qD$46hN!?1C|io|<_u@g16@Wd z(Fg?1=p8)dkWz<^ml6Tj5gO$hpB1N5msV!#PB5pfwCOBu`cv__=7kQq*r#Tc7E@6z zdr}5qs*slXK39`Yn%?=rslQgOTH0x?@z|h%fI5Y7kQ{X00BcL#8Jae4Dc9M zR%ySU5qODGnM;n#&up^M+PIddhxizA9@V%@0QQMY#1n z%{E8NS=?1?d((9Bk_ZC|{^(juH!;Mih{pTo&tu<^$Twk1aF;#W$;gxw!3g-zy(iiM z^+8nFS<9DJfk4+}(_Nza@Ukw}!*svpqJ)Nkh^sd%oHva}7+y)|5_aZ=JOZ6jnoYHQ zE2$FAnQ2mILoK*+6&(O9=%_tfQCYO%#(4t_5xP~W%Yw7Y4wcK|Ynd#YB3`rxli+9(uIQcRuQW_2EFA@J_ae$<%!EbI9c5htL`8>3Myy)@^=J)4p@nB2*&sWCOmwH zwYi;-9HOboaw0ov-WBk89LqGY!{)>8KxU1g%%wMq9h@Aie^42!f9`?o32T4;!dly? z(N?67=yo%jNp;oIVu7;esQ$wG=Vr+`rqPB&RLzr@@v`H-KK6wTa=8b<;$yE1lQGy?A1;JX|2hSzg9`a{;-5oh|=bFSzv&b zst=xa%|xW;id+~(8Fj7hS5BPVD(@(`3t@HUu))Q{0ZrqE2Jg zm6Gv~A*$A7Q#MU25zXD)iEUbLML1b++l4fJvP^PYOSK~^;n$EzdTE(zW3F1OpKztF zharBT_Ym7Y%lt#=p2&$3gs=g4xkM8A%Cbm*xR)9BnI}5=Oxp4GEF*bjFF^87xkP4L z;StW)zkX!yzz5^Q4HfEicKi{8elkFQx|0TH5Mtzsln>TN2*5Nypl(7sj_UxoN|KSyOP0g{L+vTbHlOyIEJ@ zjfku4x;`_FLga2P{FJLrgpIt;A-ukDuPsuW4#ApWE7|&i85Frv()~gOM`v`YVsF0c zx|J0}YRtNo7DIl>N&+%c(o1^C?%>Zf5<-<(yVcj~p88d;@=(jtox_$Af#v4%=g4oD ziv4MKh%Uf}NHP$SqF6mZj>}_HfC-@2>S~<3qOIu*R^%7;`VGN{ay@0(xmKM^5g9H4 zaq4>^38z|jszHqa)d>j#7Ccxz$*DGEG9PtB(d31?a;2$u>bY`CigPsg$zpDTW?zKg z+Ye-wtTjYHi#Hs`5$aDA=5Gl4J>p1Xs3PJZWWgax9~(h;G{hDip2I=+bW1ng3BrMC za72TsJR+;*0fSYuVnHsA;BnH5x8yc5Z=Bno0CUc14%hAC=b4*&iEzgAB!L= z`hhC!k&WLZPFYJY4X1pELFsAnJ!}Y@cW6I~)S53UOve!$ECM^q8ZE{e{o}hoflqqy z1*ubPGaeqs1&92?_Z|pDIR*gw{Tf^KJV)G*JLdzktzF;w@W<(X2;}XY0Mlzs8J?$L z$HVp2*+(o8?*n6cqx3_k6 z_&05@yeYRSfWQk)=oa0v#3BHNBBd>{fP`)#O^*^0_#?tW5jf!vCBp<2W+WCTEYeSv z9x0#bu>tB9M0W%_p^S7&BHa{2hfNL5eUUq4dFsGvgW}38M#j+AdeC5Q0pg^g zVzX3vrRi^YI(~*BW_Jv^o?2;5SRY4UiQy4mO}td`T?9Cn>K+dHL)+V&T+H2e9cz36 z3w!e<82_a0Abraxx8?L{a%&###&w=O83@y6xz0Yz{8$Wp? zpRHDDFRKHe+@^Y7*&@z$+aA;ksdi7xdV}c(i1><3F00dIA(v8LW(^O*HX)5kc#IRw zqF;w9l3uQK5us~@YEWk+?*7*(7!*}^OBGk+&H=rcQ31wWiI7@}vU8P`@-3x85BGy25yPLiFcZ9Ix z&g>o*aIM5;Y#3A-9~8-WmTezK5V~98kP{j^ZZ|WDa{ZX{nzq*qy3?Lw?|D4hN>kzB|OT6-b>reho-)KPiAg^M6 z^V7T^-LL<$VK9OM_AsP21hWykSObS?gk4L=NQ@Wevk9nXUWk~lu4S>zqFX4H{cWCE z8{eF=%>j8Xll5o2)cdA;Gx}>chr}9ZPv2kT=8x~q=B4i_@+{8-#jh5lsK}aj>0zxd zIl8*E$!(}Vii%YIB_2V6>|Ove`W+f~dqsd+*K|~yHvkUoMukz^XnLgcXunf+E9#k| zU0yT>#IG*W)+6ue)vv=xfDT{9k$;BDL!duM&qpGVui6NbuaKa`h?7i(W~4YUu2O@t zV=FEUMaC0QAIZg2c%Yb_WFI$vZ0z*fj-GdWkVMt>lDy@w)qhCE7c^Vx0i34{@bnQJ zMhB3B>8stMqGsKyqUsN>cE5xczm}r!D&5+?zTtYl6!U!4nmiPv?E)Pe$l(A@E1T7dD)Px*$)#pB(Mccz%i%RKcuskizkH& zM^+m#S#sK2?f8;gH5BaXCfyI z=Mo5s;fHbBh@$hNB(!H7;BeU>q)!Z^jaCks!;!d2W7 zv{8hf2+z&R2zAS%9Tu1(dKX~*{rOT|yjLsg6Bx_1@bTy#0{R-?J}i!IObk@Tql*9w zzz?AV8Z)xiNz}%2zKEIZ6UoVuri+AT8vVZBot|VA=8|~z-!4-N@}@Bfq$~F4`^LO) z?K#tKQ7_DzB_Z%wfZ*v)GUASW0eOy}aw!V^?FkG?fcp7dg4lvM$f-%IEnIAQEx7dJ zjeQdmuCCRe*a?o*QD#kfEAsvNYaVL>s2?e^Vg|OK!_F0B;_5TuXF?H0Pn&9-qO85; zmDYsjdxHi?{3_Il0sibc3V2IAP74l2a#&X0f6EdwEb_ zCHuQC@Q$(2$$0W&FuxtPzZJ`{zM{%lcw)>^c&ZZe3{GU#x8ZmhC${E>XcP+}<0zKn z`!He406MT}e^f*=$WZoCHO>xt?AE)A6xB*54a+>4&{!W0*`Q93ibK&4*}N2!PdjOa z8?@WRHjyEXqa(1=JSuglKreLS>x>SiHMYiH7)EW4L&&HyJUh+>opC2p&vz)-)hLZx z$xgyMGH)3R3o|Ptu(n3@oM8uX^(hq+q=`-aC1BlQp2I$eKj1tJuqDUh( zDkDsZ^23iaH3;bn7U>k)AD&%$u4G55$I=scldY;vFs+SJmR6mE&8&=C%8}PL3Pz1e zQ8C!gVj0PV2ym8>BOJZh9EPGH7B0X&x$=hK?E>1-@+vYaj!Grfw5!*_$pLHotuVn@tVzDd6inT? zVRbufqa&mdvhz=1^!A^mshoYUOn2TjV3fhuz*2mdNqBX{nUrI%6StBzCpt&mPbl5F zvw_Cj$en(bhzY^UOim8~W)nxy)zWKuy$oSS;qRzt zGB#g+Xbic&C4Zo0-$ZvuXA7-ka&rf8*Kn)MO$ggardqZ=0LyU3(T};RwH9seBsgBc z$6-BI}BN*-yID>S62)&!|-r4rDIfw zn19#SN$JA4xngbeGE4txEV5qszS(EnvzvVfh08c;IO5>d^UpU#m~24P{^7AVO7JAS zXZ6RdAp5-_yL;j@AlsMp8N&HVwHV>9DfH4c81xmzCzVZ3fXAQ+=RnI0B<;YfHZuqa zH|&*09Aj{ZsDVS+5jB{XEkd)PR5JO&0q`JK;9>!6T7%b14rbcBtNiw}OPI9h?u#%^ z{#w3(2+S5shq7N4smmX#Ns_ayWl5jP^7M^2hVn&gl1y>C@BvQ$Ah*^_cgzF=iG z39Lr1x6KpDuS0W9tH%r}N=vnOgCk^E`0I|6X8%H)E5a1{r;Ooi{4RF@DssCC6!o~J zDpXb3^$sNds;bMqm6n#cJ8M2#j7A_?^(fYr0QA$GrTQV$n;9;Qkh~$WT|e1Yq}o;h zEk_Ww1Kf4%%?R!{!c91CSJ*2fr<8xHF)(7!_%EKZ*$KsDg&ALtP>P19z99^whu6ms z^F(P(PMjgfp#lXpZt(?04@z5J{`JHow@|N~KFN{8WLok3u$zxk=`cv$?EaF;?XU6*mT&GJ_`>Ma3MgI?U07^UN9N3Fe37d_Q@ z-K2Z>R)Wso&W%+APtaorr8H4bEP6FH4p7!F)=w=jfs{I20h3Vck4N=Y(~XC1-kIAd zy5x^LnlUYu)zXH(P}oXq?U#Bgp{4bf<(9x%vx;I>b+jS0&jtaYZ?(5Pfi=RUF`r58 zPQbIAX=tIC=*W@cR#+`*i)vPR-|p^(ORBp*UB+Ei6;0-CF@No`$y^MQ8{I(2`CNzye&0=Q^qYjw%}y zZk$+l#(MVftcugPvORxL+@7k(4XzR~ti3!@toSymCaI5}vo}ri9vdMZa)_TzEsCB^ zLAkET9Z0E*!fv>)%Z#tIxUhYw%QRE2;98~{O{W%9rXI<-_{I=y%%qwb%iNi=+!>Qf zK(HtaA|ze7afz`txb*_lkb0u$(ijK97^%;axfg0J0#7NIs61X5HEQ=zq4Zv>VMu>$ z2~v10H$A`~ZB}6dK%@F2UgC9sMoSgd@q}!<7mY~z+C3H5tBW}xeKN&KIXP_?N=ed~ zFv^}TDs}$Eb(JDOQ;H7ZUNrivfKib({Ix|*X$AZawRj(j{g<^=Frb3--rEyv z6xZd8uQqr-K=@KuDrN*E`gfQ`mxKf_5w*!nJcKf(S=suW%7rFjx+s2> zi#9ouh%>Rl2Ch+}ie_3lybm-tkHbTSJILVkcjl~h@Q}u~N~u`668%(zQ9>9i7C#5$ zx{s(#H|$tR^Isy#9Q9XsY<1MHT-F7OyLQJdGEvzDtP8S6C2h^jU=C=>>*UM{Ijd1dNe~wr z+2V*%W+RpfrPRjc)E0!+gT^{TN*3CN1C}}95a1F4XwxwLS9A^ttvzq%M4HJ+$y?4I z`yKD+?Z?h%Uf%Z`@?6k*M1Nf&Cz(V^NgBygk_J*oqqX3`NcK^Lkg7rqVHhw@z>zv- z%X}I!;8!nQ^_RTCBos2Bl+SVD9Fa##0@yip*+{E)wPQxv$$hRA!c&QWLoLFG2$U zYDR(@dUI1w4`Zyv?%zhHwZ){BfpG(vq}!Y;6q(jI@xnbko7P(N3{;tEgWTp9X{GP3 z8Eh9fNgec!7)M?OE!e8wyw>Gtn}5IO|5~^)!F(*STx1KCRz?o>7RZbDJd>Dg##z!; zo}rG4d{6=c-pIFA4k|&90#~oqAIhkOeb6poAgkn^-%j66XICvZs}RA0IXj6u*rG#zR07|(JUt8bvX^$La@O#!;a) ziCtKmEDwgAp}1=mhU`6(nvaz%KG1c@?X8FbZK*QU*6mn${cWs15OGLA-803ZO-?=7 zah4u9yUPx8iI^Q~Bc7;DSaf@k0S@+p?!2(*$4}3v|?Nx~swkjwTmia)C!dVfht zzo1E-1vmsM(nC);|(Kp4yaPusRKec@I0b0J(n9k*tg>E zC-M)?LH%OLASR6}G-`?oyQ%KJ3(+KfS;-Rndh?ku8frhoZdKm<$0bj0e4I_lCX`7S#zIYBZ*s)i1dsNx5wX6~IDx z(Oz=(Bo4-fnzObxxiw~v`H}FuI<4v9nlM*7QryonD7aNenD4Iivwde7(TYd34Y|)E zZ;|i*$m}OZEsYWN9Xn+cJ?tl$HcJt&tK#m5)0pE@XV}gwcJV80^2W;>rR>%lUXzzrnFRHk2?0nQST``j1g;Rr}E@4Bo##q3%WJ3kW9`oLwIq zA0vY(vUKK{!(xz~Aai`k?GLCg(L^>jk7c19wzM!kci)KXbo`HMF5|jVUqOh5zPHx~ z7u)Wv`L*($bdq$~K@z$=!D+{HF@qBwO~Iv@@Nxw?Fyp2O5_#Ys8J$}5^H>J%`@CS{ zt-hYIu7NOhv0I=tr-?4EH2w4i=#_UUmFjs z%A-veHM(n~V=b%q0^_6lN0yt~Pi!0-4-LyFFewUhvZI$BFGs7)rVm2-{L|9h^f~Z)eyKyr z7?*u`rR)t7ZJ=8!I1#4|5kHXDmljgsWr(i6WPJ0eCg9K=mNGR7`F@<9Y)ptr=d(G2 zyFZ6ui;z7lu4{L3aCARB69KtaMekNz59bzEC8)@)F`W`q&hnF!@hlaZlivmQh~9 z8R-`kyDt3>Is4#t4`YaCAl(Y_9rDyTs1KYE_5gKHl-~>Ih(L@+s?${L`>}yrDEr-q zaZJ6`3Uhb_efWr)4dESDe#xM2C-gvCth%+_s@(-6U(RvIlv?Ex6v_UD{5h)9b*>N7 zzip!Gp<%x}c#!@x5`?mLYygtk7JG(HNpnAPnU%2^Gmjs75I>IS^yb*`pyeYn!J7D^ z_Z#@1;rrh7(T48tPjx2LKtKflO``Iz@cr-po+gBW$}#TuxAUQHEQAn2AEUg92@)F; z3M`=n3n&Q;h^mjIUSbe7;14c|RaJ{dweE`QJlDm5psETI1Mo@!_NG-@iUZ5tf+VTP5naWV2+Jq7qEv=`|Y`Kg-zESx3Ez zQ)3pq8v?(5LV8cnz-rlKv&6J}4*g7EdUU6RwAv#hOEPPngAzg>(I@$3kIb+#Z%^>q zC6ClJv0EE@{7Gk%QkBdOEd0}w2A}A(xKmF(szcN4$yDCezH)ILk`wx*R!dqa012KxWj{K;{m4IE$*u6C-i^Xn@6TimgZXs~mpQrA%YziFDYm9%33^x>MsMr{K`bk4 zmTYOFO0uD{fWnFuXf{4lKEGfjCSAEiBcUh~-RK~vwagYh%d^zqS*rgiNnc4TX!3<4FL7tr3;DA>RcYrMt3 z7h~TlyR(x;>v|5s1e#?b~H|Pqc=q};~YvHmKp(4Zk9bYF9IcEMmW{Q;%denJT?l4 z70{bSJ{{dIb)jJC54M+j%am#jwFugdb8V~47)xgJ;{uA!=Zs?&88BQVhSI&P+}(>q_==| z7JnM15Q4kwb~Px<@LEs%cxdZlH`{A~E3?IKpfJGR2rv7%N}=c)V?JJ@W7AH|AkZUh zvi2w)>RY)$6mkHQRo9L;PYl3PPg~?S(CX$-5+P!2B}GqIGEw- z3&}?!>|j7^Vh!EMc2U!gsDhS&8#Pq)SlamRXJ#FxX`caWHH_RW3%~WsoF&WECP$2g z3vaHqsO>V7k2xZwX3!-T2cj>VPidn8C|_4c?CyU;gpnaO(?YGO=a)9=Sc(n>Zb)C_ z>8fRKP6=d9Wg?&2G&5nNVU7Xk_8F-TmDrM6uNLZNK!U|gEn(vb`sw~_Q7LRLhitWE zJ{DBl&v1l}uTVoMM*y8$1{W*UIP`Ju*BeYbo`gJO3-K_tZ&4g%BSpS&lGf9 zD<3|fTK@&&<9U(QZ?zOW4zHKQXw`?v;uSZJ3ZIAji)F;jrOD;GeX1VSR+>@*5?@>z zVUfy2G!UmbDU$F&S&~3{;e=EUs{9uU^x(oT)!;)yX4Es>NE-7X%5^brZcL7_$KhIv zr5CGYP6|tw9`3$Cz3Myl8 znbJvOI4#W@<>Cyg>1I0>WiZtflPr-GM&DAaVv>AI;InpOh-5usQbSpOmTKY9e3EKR z;Hno1gPK2lJj!r+UKn9Zp#3yQStL5eP+`n?y*fm?v zA84*u&xPM4%6OaA%lsEMxp<}G&L4b#3zXfT`Q&U=2$xO!&?4X~_EUw`E}jd$70B`D z%VO!*-NSxZ=hz=*vGi#2+0DPI?Nr{|cA-Xm?8(IBQT5razQXk&(-b@ZJgwDKQH#!m zNC}wPd|`LEdw{jkq}>P?kLv_l`1H;`3Ypo z<=~^h)h>9lcSp#~`+8{d*nkO{Q57=hcqST+<>@KCkjsY4-m!~JrSs!7e3YBf5+gie z@3YxN5s{0Nw97uJlOQ$kM!sMpu6~+PJ9*Ym^Ru?p*)mlo*nLP}tQcyY@^-0%KE==U z9_PrE;U|ZK{=rZX`6#d#514_!C+5->pSvmgNS}EpK($i?)6CZ!Huf)`&x;5Z1A(&Q z@DlP6YDZ(sbd(>nxM#=4mhsQA4E;<+v`Q%cvx`xmNiP4h>WvTUPJ22uWaL49LZe&$ zu1$oP!=mMt@SLsRR9nk&V1bN$rN33*%D|rhd|xC)oT5}P_9ccwLRy4*EnFy#-VG|7&>jsJ2#RpDz#r@68GuOAE*sQSmL#Re$ z8y$k2M}GP&w8RPob)Z+eZez0hGJ6;ig$hoS`OMO5oKKR#YtoGWNpHT|{A-<2v@r9k zdHaj`SnX5h4E^0M=!*2hM>m9i#hdJD+AEofPeP$bAN9B`?Qin)0|4sWhwTizniPlA$1E6xG?)-y`KbWVB#R7|wk*IeoeRw}# zv0XV|5pzw9*e0TCxIsLcdLNFOYX4Y^gpD&=N$!;WMK)%4;Wh80b>{oPy}ot6_RYmF zZFlk2_X|kWVuVY)O#Vf9iHpmhr1G2no4g{P?=gJ_UpU}HpD|jo+qJb=ynu~|cc+v- z;x`}SwQprny~&aqm;cD>#RsRo_#Tf(pEw{Z8_{2^g#CKVen}EUK}tsX@2GvX6kFB{ zz@BgZBarBKocTk%rxxP`3yE^XTF~#~>G?6S_kr*M-OA&x38`~(+>=FcD7CF1Zzp~R z`rhZwkz2j21wH7{BU2yzTYRZMGS+cNw5Qs<(MJzN+PcO{SFY&&dRNlj2{vylsOs_+ zxNOcD(t>RX?HVbjT||`Df>@!92R)`K$w3^9!FYA7Zh8->KU!x)e?ztv$;IVrH@|W@fd8 z7BiE@%*;%u*_qv$`FHN(BD$hGqB^>w>&yBw^JV6HC=#GpjX!WQ(zeKjLwM3%)TCMT z#xyLTD8e|^YTKwg=Vv1|?|13o6!&U$_A}W2wWMcD^#DSn@g(5GbsHO6W$I9JNSxoCmsH}pFn8j_Wxk~5^ zVhEXZ+s@i0YjOeagPLSQYoxR{i2biszj7RW*S<_0j2Dw-Ef7qqLN%~y`ZAHIINOP} zvmaSn7x|DlC&W$UxkMbbJ&xpGD97rRFi#}3H61(AYVcPN9YUF0n72Zo#a#jfh`6TX z7!Pw#0~N0S?BC*wDZ0l04tmB!J145jwS;Pci*%m~ID_r&x0H;>J>$x}okimL!WLb^ z%m!KzacfeEw#alud8ZbsYF& z1@a|GCQHDAcQ3iM5LfSbz{fwQEh%&k<8f6$Q`yJ~Y7aO&6=u1}-*Gqw6$crh2cZ*X zMJE4cPZcdI%GQ>e=U|%r7EWn5pWBsM{|l8thH#qb@2{EkxwMBgjvOdH_IVX`Hh3}l zHcZa5HIB;>NekQX)ukMQJ`DTqS}jZ#j|$iH=Y_~kA^2?d%gm$PmPGuA)POynhUyaK zegRG1n2fzKfWg9@a>C@^5M)xpFSicmIRz7$?!Cq3uh(hTvD(>sag!Yf5*aMvtv=^^ zleZUVg$1$=zDs9p6Q1CAH&);!jkC-ZJ{fW`hE2o0x^4F_jcyr4#!ggqbcMo}icm`y zQ_77P#ZDAzmQz~g1=4DW!t7IZa}Z7thh#dEqn7+`5Lf8=4OAj_>AZ3IGQlz5loU2V zh|Ok)*^>O^ITIz*6(a6LT46*2Z8qn|UEzXV(Cl(`t!NL2^RU)JQ5CwNXU<%q`gjnv zF8YRI{0Qs{HiYEeK^2%=T5HFvrq^)R3Z~s+&dp-ZNpWu25qg9QUYwJZRjYFp(D>*A=`$9U_~N!BjcnQhdaf0Wf4k~Wb-yz6v=9i4rRTbdv0 zO)%vr@`J~@XKn3Cmo;jazVHe{VYoA-^m4ZO7VwZ~TARsMO7PY(!ck&QGkAgY9Q9RJ zLr}6J8cX!W%WFefwo9}P-hOjJJd>||gfOKNQ$xEbxDL$!N<$66h}w{A$tdnEEUq5; zQB17>Yh#_2o^GIeLQ`D^c**S1E;}*EAjaUHZAmh>Q~WW`RrCigz!CK>NF|IY`w>Yt zHl!vK+Cf`LljiFI=u=(p3$f!)&jk0aE{~>@e!_NZAc2Omti-mkw)JiJbz_^F-VP%u zQ&y+sQ5}T;hcIKT?jPxfEv!MA!t{oa;sV+#hIQ7_qx8Lz5Sulr_iep}MwMTaYYHyE z;th6PF7kKkE$1mPSGQC0?W9DiI&FS zPw(Wqb7k(snDvn6ol!D7!#GhJjH2M&gJc}C(-vuZ?+cGXPm&H#hftWUx3POg66a6n zfN##yl=25{SXg!9w>RJsk>cLGe2X4*AU?QPz|qi6XRQfR&>EZ1ay72<=1iIAao!gl z=iXCdaqY-04x%}=Y(<*>tlU_^(VrHIH)W}5({50@Pf_Emkvmy1_vz}FN4%!arFz{@ zGv%Z<%-w_KloV$v=!Z~|Z<%S|Y2a7~>BkxgdN}R+5+GE`KL1&xvnC1ZF`O&)@+-)Gcq!xuuB9S0X>R-t2pteqfiBX18=s!G>_Y z1xdnN_B)8}I9o<`n6y`b6?TV^e{iJi5!y5A8#Yc0miLEe zI33k{;HS8^<|IEkcVzjj#3rzLtPbmdq8r6_xeOf+1flw@2u{ z7ph8+9FzeiT#-P8tS?i#BdQ^$h{Ww*F=6X>5d^;jC>JrKa`a2vZCP4F`(r%|qT)+p z8I(A**}QO~>w_{AcjCG6S2(!)!0Q0koYHOqp0J7jIN>?pqxj+UPbG(ZzH%R7XM90` zj$jS22XlLiS_ef1-*ioM!Q*00STA}&18-3EN|(Q&<%b4;8@@tEm^uU}c!LZu9o`^A zX?d0=!n9~@Op+U(i2*`#N{3pe!XtMPb%k4>*#6S)3<-sC5x+);@IFHe;)vLac7gVb+ zVy%FX+y_#;fY94b0?IYZkO^Ow#D_#PU~5k6IsF|@9#PExC0GDbVu*%(SN5nu45KYs zKy!crklZl|C;1xq4#gk_`Nhg`S}5lC++i0e&GcafLxzk_hVLkBG5d2y{94=Z+|x=1 z%axSnz&LR0GB_NUJ02Lc;Ywvu?Q4ScA)Ezcg)!G2B1)N>;~wK=y{3lDg{gpiV|7Qn z#pOEzcxTd{r1`A7Q=fO{Wkuq(Nu{edMD>fb`0?+_%wU!>D5zX;AqW)-;3!Ex0vhNX zU(=77+{)#g(yr-uoy1;VzA7=eqw-JnGPqHOS9eh-G-@b?^PL|t*sa0#ONj?=tb;`? zl3AWgQ;F`_s;d-UQw4ap81^{HPK`38^=*#j0=$C|aKZrRIa{?amtPS#3sAyjQNNE= zMb?g$oC)nJIPC#jz%sw{QK8};07-+BdV^4n4PcL?xNe2Unx(ja7Qv=z_StA;h(t@` z(NNC7C@e%oWn=;U?G`?^0-gqzf+ur;K~}LsU5XJOUlJ1+>uC@)ch>nl zTSAKzE;N|>ob6G}%w)1smx;CC>fI+tlBydTE74*M`xWyfEVkhU0|-YvvQ@BS*=1*E z51c1H+!>B81O@#;EpxFY;eQ!72d*%yDa90owz9bww$P3P!PL8B1NB1>hZm6;z}(0;}OlhLJezvWPX0@NORT*jtJ!^cR@vI;g*o2t`ZiJwUsBg)gff zZE|OPnxbToa;liDWvy7?*;dfZj1DP^FbC{!haAw0nvpCY1``va4NgJN+5Q4oFCb0h zt^a99;!%c9Qzhh3JiTHZ?tWHR5Wz2sk&=FEtvf)LAVL}ekqCQE?nH=)#wWLp>@1CT zsg*%F!$+?0Z2>!V;;{xXE<^&RS}z%8PcOkF{p!LGufDBPhMPC^ zG$q{wZ z#Ja4}W6245crq5zje}Y@*c9{lc@AzpQqmGuXJ~LY$*{`hg&Gf3P11|WiFee_O|b}! zVRY5AG_P@)S3`T7$B`vU`zoGU;5|1#4QY$XU%4+;XJ0S*Gf z^`C83$;j1G*u}-n&e+z>nM}^X#K>0cbBxQ`${65k4P9l~vmH4wj!dK9Ds-qvw$pf(6VOiY2 zE?B}k{2zUxzM&EhG6jZ^@X=))R&lRCJ#H4rUE-D}<&<(5y_%LK&nIcv={%BK0e!`un#9Tp#Xwr-Fflcti3K={AE}6#+kt{Qie|AZ6 z6*&nr;n(wh^uhJE3@XxoOU#BJE&q;S)ux&^y%En`f>||6x$_bSMn;dC71xBhpU~E{ z5f2v|P{1Cv^jl+$^NJs3E!XibZM8w%4kl>uy8yA#xpwUfn$HvbVs|_LMy>AUN(Ar4 z6ZtLFzwcQpxj;zF&-MnRPYxT3{|`I(dzBso9p=4TUAQ4of#Wd3q@H-0Gz8C6U2uxl#VXmC}x+B`>D)ffK;%ZXO>H zPVvNavG%b4+j~NPJ?rVff87JMOM5lOQOltlI~`eXFb2A)9UhlOiw3q{Ke>OF<`kMl zD=jNgN&(C4hl51!cB-wzNNv$JDl%R#CFx^wJ8zI;*wqhcfv8FGOLzgs8B8@F<^2`p z%)SN|zLITOn%{T>nk3;{6-GYt$(;vrEOutbF+({n^elu<|244j+ z86+n$mOkc15>j*V=xfd1B$*G_jnCJcV9-J8EZ4((lhmZiNJw`_M7fwG&8pHy-Ke_I zrkS&<(%!(i9Q}xb&7WPk`{_kfquVmahoIG>3~7f7S+RSV+E92f8X9;%>e3J=Cr>x0 z&~#wS|C19#Hq^JQmKY}+yCL3daSWFY*=wp%?jSI5|8X-huuF_swuyAM*laABQv<nM&9OUnkdus9i3(4|D}`eMP1@}Y5Bb1U(z#8*%%$T>s4~qFx5>;H zHo2s5PKg@JpAq1ZZ4ryNp{ihW>z)*VLmyu=cWSVjU!#O$Av&KhM`<{OsHeT4W^L$D z{FjnPLb}b$BGoEeF$aDxO-llzmVFo67b$7hXg_8Tqtl11I(W(^t~3EMSd=YsUc-tL zeLEb+dK9(xLL!m2ow1)kliqtx)H+c?rCAXtFh}k)h<{do_@=OvP_jjD3nLJIHX;cA zVfvn9=>eu_t@R0_vlV-GJm~znRBf*`LeMt24Wb(uH5ag1#POrx5gcU1N=^GbQA zX9vONEw_HE$REtCE;n>zdhek^PUnZ};@#Hm_lec6sYLgf#WB9v_nsZ5KeZMY7auW5 z_kJ*q9eK)**B@+THL8Vch#NR9ncS;4qP#j6})Vi(T4b#5_y$z z7?C9%S=An`M&>9nt=_&CMr#bKi5!PK%Oi^X!xk~)OE$*!pzhBbDl|3c_cJ?Jt|od% zuYTxQifMN~M*;jbwvtdar!}ipi6*ul!tJ)0=`QptvVjiLWO?Ld6ii1euZ#(56TeW0VKXYA zO;JSEAuLdOhiOC(zo^YHO>63rTdS-vZ#(9539=q3ZSysm;qjs%@UoRNo1fD+cYOcer$pT%eNH6nAI) zF#HH}KZtL)Sp+0rH3lrc-tc*6T!UfgJ4jfcO4jby`$s!NkCaEoshYG5Jo6~Z904c_ zN@%e>N*~A}l2(TI*J0P&&ek!u&;b12$=W|DWJ0HN04;s(4eX5ydQQ`7)_VOrV%JU| zAsp{6!;B$uFYtT>M{r;b#P62;8PhsNPB~ zDoO@&p=doKv4mZP-D#zF_D~qc8PYJQJ|xuo%cr(3q7)B2GZMPwDGIJ&zZi;fUEyQ^ zlcs~)j^o>q<<~(~Ioj!$ZboT%dYqkYXq&vL*WDjLt_ESAA*A_+)v9X4Z~1?D*Gu@I zNYE?q&aC%8EUc1@Gw-PszuMQ!Erq`S#kHQj5KwM@PRZ4NlK(ROXVva0&c~E!#qtJ0ujV8(>y;aKR3G#1Mf43 zs*c3YkGCB~5XCJWkhOHBOJ@*-bm(s=s<7LjkA==WAdsxiSCN_HG*VRQs+ZOv^y!x- z2C;A|nMuaXAm|6=uTAFdv78xK6bw>VseGo>i1Y#EWJOx3B56}m<5I*`T}qD9x%_qM z>9{{znOJ%GMVUDWcqR9C$0bwpMbQjd+S2r_HA|s-X~_nZcDoQ?DCv38rI(hSCE_ZV zbvPUoTrAj=%zqNQ7P^-Fp>bqVgI}m6*^!WlyGKv+92^oWZlrs7 zLP%PeYC`}14V}Z>{6=9~EdATJEHiIgFI)OD3;bRds~f#P3rA87s!!-^uI1br2CapZ z`1v@|yHda{pTH)AkuX@Swr8a=g6N?>VNRM z7dRL!$B(sDymlKemGkMDPE2d*y(`$P4}_OZoiG2^U!|m)OKnsrH$J?=XL-5>htARqAgN!n1k0v0x4yHek#IorCFRo7^?-1;kV#W$fYQ!QZ- zomxY^(n$ZyZEU3bRd(Qmx=%pGu6}>mQ28S?VS|^mSzr&Wfbtc!fa(?ZZ>1~p-zrz^ zzm3k-e4;KOo(bR9U`{KmT>prvOF+)a;9Ml_ou|vL{IM=Wwe`oeC6zehu8qmGfVHua z1Y$@hbgk2??zN>r8?u<}nJOl7GDqOU+A)^>wkuZ=$Y+0?aq+`izt9p#hof!8mlE^O zf~Gi`+8)>#I!~O!_k0@}6j5)Cw87lr9N9gq4%B4BC9m4se#V(Ln8hzIpyRB}YGS^g zuNz)bukTc4-C-cH9TGtxvp~CV=`XTDd&4S2E=a~QX zH34ta32)bdsH=6WJ#2@#8V6}tbI48DGdKfUvU_^LA8y+nb4GUQkR}LPxm+CNd1|r_ z1{{kl@@K!{B?`H_fqa2bMp=P_xGQl3^UVQO)zE&*>6|fd0-ij2&(}+rzuIf z5BCVJgPeH`_W2=)_-9p+r-e~Ku;noOyq)`Rpluve)JTNOUH0EkxO#^Pz8g7A>2|Gu zo_MJ?scrYD45&6ToEltGJj8>3)|>Uy;dJZ@3c-Eg_+sB9D&U1|zG;L97$k}{!5VLm zZTG>$Pkz}N1Z_+lLxbHRQ6so1{TgU- zNgLZjHZh}%$P)p3^Gekk&O5Tieo9&&cDwA6`Vp6H4v$08e1lb0n7X`!_x6ZQd5Ncr z-1or8K7tmVoT%EEwQD=~7Pr?K#Q{0Fu|sSC$>>4Wb1Msgv(Z1Z(3m7U zMO0y=!H*S-W8oYSQ1PnB#xO?}$Q)^p(#SI7QlV{J=a2?GYE5VN`98&>h?oe*R}ep{ zozpe2vsQT@R#sltkEM-?rp}MoSIFEzNh`e`A6Ph1sa~lqf`_P8wdR(|ad7+8L@kAF z;vhFm@833@Jipi6uq3Pp_bF!`={6RZ)_q3e&#G#EWcSA-dg~O=vK_0rWH@i|&I%f1 zoygC}jg8DWcewP#zZ&O+CV8OUQ)Dm2p4Bjk$?oZgE_%JhAOFZW({kXYL>TpT;Lzz_ zI|FZMvT5ZIj4~Y)tmhAPt~%q0DYhX1((N?ZWM}JC*I_>20dJ=5-SmxUPm+W65rj^`Sjpw$s`^3 zE*(gDcZAiVe8og}D*eTK{{60Jzb!|N-s5|xL@(8VWewvmO-}3iw=6G!_s9I7pXH&* zrdXkqzmYytJaFoVEQefFHzj&&L-8Ck-zIBhH1+A6Dx7TbAE^RAhyx%HXL5skx89S4{#ET7{&c zmPoAZzn~8EGBAIa)Vb6MJ!#GZi5MYbm5C>b(F_nXi)XRA1togzy^M087T#tVYDd`x z;*c=}(IpnMfRND&nI{v8vJ54n?8f4lN`3K^%b)}oat1TifJuxO&ZZTXv5pUhub0Va z0wwYURnZ6}Gm9@r5z`F%e3zeTCje1FB69h@e{T5iwyiaFBF^|31@L?}B2xY5NZ=o~ zE$(4v0{AEMu;!Eh>^}AfO&zIZILKE}6cHN{5EEVqDy8a~1SAO{o{UWYu(Q(T`PAts5V>@5aLwuP6?A4V6(t8AZ*csoO|B$?XQ9mzToari6>M0&(#_q-@sf0G2g@us?RlnK?i5>!_})FfdEnul&4?fFyZ!m znCK()B;nqc9yH<3(+;1HNFSx>BO2|cmH9_>Fz+Q=1y^syP5ZMgbdJd#BU7(9as%Ha z^HX%VEDCVvM$S*Chwpb+?xd6lMjE*fvLWo&C>YLzd&w85R^HGrZ7(kpVPCu?l0Gs1 z>hIk~pj+7mBThy96}uG6s>OMG6mD=@i)9C}#fhwl)Jyp^xn=OVCWhssK}rg8=eT@_ z#MM-!#b3{H*Xr$FEUim5yRH+?cP*`J{c|f&rbWvFlCDFuH4#)*;lNUt$}#2XSF&9v zrQcdn7C`A`pBI)gGu9`(w@al@TAb`ex0c_we6RkY{rql>Q9pi>PGM8b2KT7qFnaxV5b zmoEvhO^tU`ABvOe!>+KynhALJ%$E>t)0)=h(O|==6SCC1QdZFZD5R7X(TTm*Q7_hO z7=l`B@tJOngSoFD`AxA6D{dmf-hq?o<*Jej1-3o?L1`s6?+mT&LguymtaBrJyuUnZ z?rVkLYMuzew?h6~WR}&&rjgWu%Ol0zRpK~!e`c9{nSB|I6c>-U%w~d<3Pru2oslnD z!7N9~Pvko?^+^eupC}q1Sey*kNzo2lD|DB`-Rbj%!6@17B|U@DbT%ss`OK13)V3c zBwneSClO9vQ^N*Z%RXYO`Wr~pe)sPVHe|_LFY!-A<-IfJFyW4DQ`-%WQ$+9`xjvG( zpQ|w~wLPi9e&l?tir%<7e!wa+NTIeV($?_M8K9Ok9K|eg(1Gw$>)_r!@~1mMWch?I zlu47XEEFQ?B*b6E2Mn(`k^R%I5MNchehcs$@A>Qon=44fmd(0d!g;b+#n@O=a#iwYWb+LEvPA@*#Kw4&DzJnYfh;LQnC6!87g zdeW^0s%^91PAO0q`>$Mb==p<41NxthJ-IB>>x%WSPot3rFI* zMf_9_Wl1cS$EV%`sC?Jhn@_2EIcHtJ_h7LBu5E^=&na;`bMz8S&E_6(zjFs3RZeiQ zuRTJN2!tO#0FHtOBj@_b2Se=SHmzr0Tt=WHWsm zPs9+a0tP&xdv8i{VnZqpkkTa`J-)KLAX(5g`{CFP0HkK9R?;p};94=j88#urqEf@h zNp86`#tPiH=peJZ1GkQ~j!|~G>DtG7jQ3c|>9GN9;LJVY1=w~3+AxFB$^Eo!vtkY< z^lHsv3=oH=6dYkZUJB8!gnGuu>Mpma_%KKAHQD%Qw+A~YE zE7L`H=rT?lQtq`I0KgG}wsC>BEIza!{njtF{Q`O>%)n&}o3jSMpQUFP%j1UC+HN<| z%(W?wu*JQbLVt+3ZDuiiDA#YyF+Ybg*l!h`SyN{^k0hQeu)8@TkKFQCrJXjud)K0> zE{25F{XD-Q59a5JYP&@17qn_&5_&P?3hqsnwKyDL`c}1=5ZJU0UskWz3a|b_9B++G zN)j91j2Rf7HbdQc&*p52&{LV;l9GveK^#X>?Yyoup(pf4w|r>&$=OG@Y_VMwA6hl! zIwQFIwy79_k(kp+&XQW7iS%nnfT|GF1~u@KPe&}8SiTJ;%RF2cz}~XJ6NDb<=rK#j zVHko2=aA8x+I!P%vZ!O9)e9UMJ0?eeR#JpbX0d512u#wxBlv;hf62v?LqwumZ%wcg zHVp25KY-e>DBPKKKy-JtDgj!RZ(S-1&dd=Xfl&QQQBJ6^qysCBFAbkG_9f#dv+)s1 z-L3APDR&JQ*PJ&s9> zB@&43RN*^1zQA-|GKN~I4qBYTZiMEPc`j3U596%W1rSO;yzSV-svR6&RH9>mD7B=u z8}eph-j#vh0v4B6McTDb$}TryMb+$sTV5 zi}_AlY6U+=R!x+it_{Fws^cQRi&m1^#pnUclQP{S=|M!jX6e!UuBpP(5qVg`=VuE5 zSpDtgx;0OGi1AVvVZScV;hZR4>PKLNj0j~Daguy8P6p8aJ#Wk2&=#n`iu={^&Cuoy z-OsacXUkkO&0G=_vb3pgg0D+_3b#{KW7s4b3?1@R)oPF<|d zG_ke%UusA5tAf>hpXrV2XKnZ|oQZ$?y0G!zbdF41MIG$yJ~1FUD|@rgG{@}|75Z;9 zC`IibDim;0C(9(jCO=WZUxP;=Hp0PKO>Q?1=4@jTW27?wUSwYJ5=htt-^akbm08Acywa z?nLL@sHAx-9N~vRRHk5`7W$g&)+fS=7KXruHCEE+=h`IRE~j?$(+$Nuv|ud;8rc|h zjdgESU_~0ZjvT}PN$$DBE25Xd!H!-qq-$f;-@rXwG-;l9#g7}!%cbSj%7`g-jyxA_ z0$^z@B zu8A=6hEd*PVO0if!FvNKOXTxHr=b0u@#o{$PVZQee5{z+S>bCizS`MmieM)ykX4gZhRpUGL6F zOkE$%^Gm`Lbd9qfXKCCp+^1dWmdg-NcoY+kwC`Rb+&@P{ix_T1_FL9HZn=tICT|&< z$H{Fd^@RXGa-_mGD1nN-V{GI0VrHfZ-iIa5NBVY7d=2t7+GO%A8@~x-5WU&2kH3_D zqk`_7tUqx{tWQlZ-v4d6|80u@L?!?4Mp>n?rirVL^s#1|6k-NPhJuub9zPdcC}t;X zlSfrFHxP;_4{1f~)}Y-ZvKZ5b3;!(mc+UO%q3O5S6&}Cuz2Hp2pO&BT6t;!bgS)$a zV_9(B5LMlN&4d5ZT`tN%!FUkZm!{_`EP1t|i5H*9W6l-hV^L zx!qJXeRAxC%aOh`>VU)L$Lc!pX&4TJA|Y^ok|g zGfQh;Rq}&N2EcF_JpyGSyGxM67#h+Ah=vdzPjUHZ_san!2g91j89&82?co8PbaI{{V*nJH-6oY-Z7TN1S54VidmMQ1IuCPAZY34*eyYOy*dkm= zWBmKt^*?yxjMko^(;OB+>mxwSTDg_&Nl3kTd_i5(x1YIH)T#2#9z=oU?&C~X&VJh* zC&dao)x@Os%2go&Td7bn6)YQM?7DCgOVd$hW<_kcf^{WhDRMGkvZ{&qjlF;(tv{(W z7$>A%gQ_qOYF&LitAX_s zomK?d5dU)Ok%o9z@e`X9dtYzo3)In;lfq*F;iGLslrQFTj^L#bFN^{P8Tk8zAsf z#keSh$;y9iM*Sqr_l1wz=EFXba$=NjYTWp-_yIAkN(S$eb$CC-PN#PoowN+o!DMey z#1(8Z4#=6dGYIRbLJMW+NVx09_`a_oo2N5P6Z`Tkkoz#_$XUhstzb@kZOA5N-Y!&% zw`TU0oGR(@E?u*=*M7z>?Wu^u7Z1R*c26GLw>%x<^sLJa@s8Z>F+cnGE%Ai`xC$d^wpgSo<>ze4WIAUE6Lvdxh;telK?xt9P)*x!)dTu6T=j*xL zkiLe*hoAV9l5hLoLxsK<7T_|lg=&wrp z*p>*BX3Uskrs5!gzfdod;X7^vSzcbzyR-0=!S>ltmUOBo(|z6E{s8j`iup7Rq~vE7 zRnWHm0f!Stlaf!zjvNbv9ylRrAYS{z{=tAs9k;ZNLce>*n4SX8jOywN_%rLNaG}t~ z3h7z*K+BU_xjdJ`t2JLTP$_d_le(Q74H##t9LWR}SnS@N19=Bkcl~6^qYRq5j{F_{(HdqNhjv^v)WoRlgkB#D!dh)d)H`V7AzDMv^$;{C4^ z(Dq~@#uN*gj+&HwR7MHYDiPnX`kXeGWIfJ9eqj8bvQ2arlrH)hxXo0QSh5|MBTKeE zn5cG-Uw&+L!y!~bvoll=Czr{~1HZ_c!tHx2zp8bUQBFMx795^CHcZ}?I3aiRZ8Jt@ z_{Hn+8>RJw9-4C{0#Rp|wR+54)ebE0`@9tpTE5X1Xwi_`zv5^+*X5_|WJ80m%iU#! zT$4bGhj}sl7l<6Z0^tq*6CTg}-@Q72iy{Bz{wn^9sb^_OyU%K%z3+0RnnaOdp-_&A zQpL(UuCU2T_aYTHVh0pT!zd})&LdL+6U;(qJd1Bq<=yFVF^WpMKADb6Dj1$ITTdnr zkEq|WD~GPtoLj?PH)h*5-p)HVd?zkG0du&3gDZJxTqlEp5F{V2jX(sCDo9KxX{~aP zv9JUY9(aVBC`pL{5iA~t(Polf=)9)gCaTKHT4&*1Q6EEeIM(pMN8<=dWxi^di<509 z(Sc7PN2z!hPuWQ`IF#i9hKhwb)9IO*-DGnF8Ot9ttlIN585zN6DTZM(vZCYWiK?k( z7OX+Nw@PZPs(N$ve{RS5vNXIEVz8|9x=3v*9zwT!STp~?Qmg(NmI|Nik%c~5QgbqB zYEC2?PcR%9L%(TgZ6eC+%rKl7BV#Sj;Ak`*nMxvU=@)1JNif^6T!`Pdk1J#2sVZBR znwpA)HPg__PDhM$6HM5|rkcgs*u9Po^PZrmgIYu~Cg$X1z*^GJDa@6o5`#TI*T1|3 zznkgm;}!R_d3@?ilQRYNV-;l9{Kma&PfC-Er}SYZ{KO0|#PQyAu1iHR9Xr5GZ+xX1 z$YVe3p(Ocvf+RYOR}K zqi8EWh=!!)B@I*IE%9u;V<-m1N_NcrdL8g z?a`g{d?N z(w+7w)4f1)n_7Zi9{9NXYDO>am#{o);@PlG(P+lnkeTc2M^U1R`+n3=5-SaTeBM0) z%kNRG@}o6-%AToQ(590ntVT?F6@U)=&6Isy2)}N*L1f4m5LPgamROcTYv*(iPyZ7c z#oWFCg`-d6eUw=UClhNO#vmqk7d}WW7zq;B057V=1_yWz^`sQ|iCPKK-*76K4e|ht!@`_yeX!1BAATkU7xFeYV z1PZo?&s`Us8+@fNYnk8(bz&7v_8NI9_DcEqlA8O-SC!D9g9; ze)c@z0tWx5DPDXxE&%#5N?4|>b4aw8>yRvSSEiX0?vLOiRHB=2|NhsXiZGo^5&B@< zeI31A+X0#Tx|c~iFv?`0v!=blr=KbwgLb78Gt8U_OIAAE2z9eNK&!s5F3F0>=8W!r zKT;oYg44jC_`bW%@*i!jZbKwGRx%8gdl9{Hbb1jDI`x3IjAJZW5Ei6(S>l@9E&B&0 zB3*=O@#A7@kk#)a|5-MdEKD-rCeGj6t~5#M&W2oS;K0izF)(Eg#omlB(Rx#OB)aoT z#GwXoK_5A|4xhFvu3CMq($#~xb8~18q6z}|Mk(d{j*7ZYQanRcz1UwW+(Xbs<`luO zHb8f`LI0u?3T)Otb_0X6$!xt|`V&k)`37wFO)&S%>7x!C60RXywvpkR*hEEuATHLB zx@Mc;`Zkyu+td&XI? zbu%d4p@UVsAW5iTL@C%3XR+Bptl=TbDEL_lvW3tV3l)rQ*yEL9_5{2}*ri^pn2SG} zR+-zw0QeD)q(v=8w55$|>$m^`e=SRmAT^m5fBNae&*Lv;slWJ>PpPj@Hs}8)xC)6D z{+kM@_=jba4xHOwYq(92K^_%!WFTeunUd}dMB?$5o(Bjbd2zGrme0Pwz*zf#={HE= zk-#G(=Qp%0W&TPr?xACqCk52iu;mm2Y}17p~)Pp;4!j)g8pxkGAfftTfDxEj~L%JS-YlQ79DmS zN^OP@{~`ohPv?81{MqY#@>z!a4@vL8_|AX)S7Gx{=taWH*~L{AVEm8Me{X*6*Emr? zRYrPOpr*5hLko^{?~9y*>xc*tZ&YiM%KMfA@nN^p#E|?c8W35t>GBAcZmA?4{UPUr zmeY-OaEd_%oDz|Gb=lAS!M&m9W`6(rdUJ;x06jy(gJfSoPLhvmgsi*@_=ffX5ej3s65C6K;Qq$m8<98QKQ&(2=PnxU-p zy1o$8j9+3oDY6_(6~00AZvJDQX{iOaWATzEh(B-7G*n?ii^k5}^sObC8mWZ$GqLO` zFQk3dGhc3LgXh1}46U4`@|u=PV=ro6Gk-U&3KzERYKq8iQ&`M{ z66z)|kDF*;2!t0`h2%3jtiMmCM!^ZbbEazf%%%b%rN^OWL#s=lwAd}0e;=qX?usTA z9(Zn-UmlKH6$@~yBkPop@gA+{^6&}OC$4EF1IHAN{w%|uvsCbY>|1Y3+n*y}m=gfM_MD2y2ybg5Ee#G4-0q!EQiw8pk8 zajMzrRw<+V4n|~tR*qNe&{ACV!QlqG+Tu_laOhYoqD#AJ;#RB7epfO@XP3?5L=4w| zHUPUmS;`H7X9qE!R2UvMsm6A;@=1O#5XSU1sWSQI@4a zZGFgOeXx}tmJs?=@*}5@_Cw*EWqjMYiP;ArX6+xYip?F}`38=k++5@zfoItr7BvNp zF4AQz;o;d5e2Pd(OFTD+j|Q|942$uF+L(@u_{M20MhtWi8oj``eZXbdJ;tUMbs@T5 z2y5LW6wZ&jO#>UCoMKMSy6g6DP)D&BF@YE9UtKg?xrubeFm**3WxIPdoUuJm6|>fa+?m%l%uRVj9gvr3LL<9h zzwJCHAAzE&-HEze3O~GobD}0Q8+EwwOWusWqu$p8zx0Xc)rsjG`nO_2#mkonxKUW8 zdT^tvODb;w?|v&f4=o3rG4P^EMVhblocIjZ`>hvC`9QX&{`gG;d5Q(*;i-d2Xpw&Q z(C@{o(K1N_^R@FKtK=F!$oRG`ANJ|~1L!u@kE-(fHSnoz^B9DTIMV%qFHDsLJLx;a z{kiDL9o$beEYbKDFhRicb1(FhJbGP|=3Wa8j344(w4YiN#2MMp;ozg{ZV|3@nlHrC zW^uW#Wd@qdwly%Kn#Y-3@(E1S1%~fg$8y?v55Ejv(DaH8Mi2lDLbwD&5!bxl1li;o z(LdPNVw+uqJe!`sO+I-1;BEVZO!%Dz_O@S66!?*QN}cGHJ0w6VOK24*rD{2LcnT6} z?;~uSqXzkQdoCHMAs~sk5Ds?W8B0!Ldi>wV}UtY5jdD4LGbGekgSgCxr;tWYlL{X}jf-~Z+7*=_Z1Km-EIkFnc0w}d*@k;T?0~RO(X-cMt?gUsdi*&sn>-7~!6{jts1NIoIy~YrX86%dgI}?$~|o75S{0+o3V$9hED;=AC2cw%Uuz zn%c_kE}cfHoSWej)Zc!aoh-n&ZK3_#(~$eJS8R2BuOn~A=IX3_35k7z6YhpHcdy?T zKih&CDm+TZQ+|d2B7GxKmyr)L^LpH%>r{7P+NA>@T2c_uw_wh}K= z{~#_+Nj<<2q>=ewjhBlt2DB&B#;NNHLLb&fj9u06uW|Ud5K!YyMi_OJ%*>q>C92EM z;>IlY(CJs-@UI?NF>1~-TU(XGwu|5~DS1{Lf9-8?OV3s@sIuccBOP*vKf>i@a+@$VGIzJD@${J?%^ zbWR$Kh@|3gAi3o+$wOkin1d7AoX>tYxR^ft5(7R*bJfR)v>mbg6-;nitLx>KfB0b0 z^R~_tVhPem2#B0P>L0Ca+st1MG&OmIKG0GA=mB{yop&crMUe&u{f>E@M9R(+e8Ni% z*kG=uijDODHo=eQsQfCP4ijs#+ve{s^Ck58tsW-rT2IDABK( zeZdFd?BB}%F6P((0YEmP3v&Vnlj%yt>UUG<0=6c-yY4qn()-Z5_dBePVW5rSoXDv6 zv8I!H;5&?F&m}_q9}C63GW9WD8U(lJ|8ioI7FNCX;8Vp}8QfcR?|g8Q>Enk2oF z%&lWU`bbvMjQq9e!|U7LrSj=juRk{#iT|GsM%2i~OxoVX%-+Sy^;6eO^>gme-r_S3 zb~O5Iyma_Si+Yi&yu<7#aChR<4D%Ji3O83tM<(wnUtt6^PYoRjhFS$ys_g$z_7+fi zC0Q3J1h?Ss?(QDk-3jjQuEE{i-Q6L$JA~kF!GaT9-`9W7yzXXt`pv7g?&7i*wd+#% zRNYfm=j`pVNwQiy*i_M^bg6a^-)2XN1Tm228%TlQ(5#}Y2#Ex7J~7qh&TQN9^zalC z1H^Vo0E6t>kUAp;eRo}NlV8|xjI4spihPIp{qy&vUN)h8%} zz?D7T5Tc;y#e*q4HO2E?Jtj9&@8CVOJCW6!pyTmRco8Kv0Xe@6$Aa0@irX*O@&*?;0Xf=JVLq>VInqATRQrg0KFw6m) zYg7;|g=VSrv)PxGi8one{g1!M%v@sL?hdjIV?Y@vbPGfEogW)9_IE1kkDEfOO9HE> zYwdcQW>QETgH6=aL}R#kOEDiOF+E%)Fg#=%8_Y}-im<;Z@9{>u{=gWSNna4S1xp!i zAp$Z{_|iqq(#N5J$R*J%UzJ5r*LjUrR#bPJU>Hs&SnMxaTLXxHH(F*_2V~o8hA|nc zp3>%Gs8VfFxr5*6ZDUmI(nJcX0m( zYBNX@GlF#qx-^JPA^N33M@fAMI*Z(nd!S}V)@;#^^kg&FUafSD$R=LIXP^A9zF-U( zH$4Wx4}3%f0^fE3yj8TPNFT;nA0(Zw3*4 zrB&9mN&Yb5^O_1&=JFLH13`qCvwlv+Q_`9U>}z+ZaViQ51E_P&%67bG!@m8FJg-oA z(H`d$B-%*g$70WK@hf+v7$rs^YtUhvm zHNWOcwjm+ukW6e!ptxSP#z>z}0xX0Yz%+@Algwn)EqKbBhT=UeQ#cuNu`WYx%-Bnl zt29^>_UO?mZfPJheZdvvf?K5wkq2;ys>AL{1du4}apz}9PKeB>gLKFs8-Lt6Bk{L$ z6_P1=jn$8sIE!1$aC+3U=C6J{O}hRGCFHD#Mp>QK-1+@Uwp=uSp5GOs!tv3$z4&y3 z{EkQOEa__=H|_`ig#*(ZW0Wi69Q?y&zvXY_2!~9&feRWFNHTC%-zzibWhC+w#U@hI zPn2l0y1fm)%pjF&8K(9JAIvA3Rgav1vQg+`Gs4PJC1TCRjP9AgS>CotwJrypkL;^-V)FCwm@eg^K46Nze^kOIrx>Xm8;V1!@~5 zjePDRBu#2!$$GR&S@dX{ss-0edeZ{El>0Y0=SODhhkB;oX$+_ui6vV77$DHsXMPfE zpR*zx19U6vU42UUQy!XKeNK4v%ToprR+MHPX5+y|OJ~`bF`8_&k6Do)wI~fqtGDKL z{2q{jPaA2Ru{ZfTn&gIx)Cmg^tC&`5m5aL?rH34}hzcMS{Dx+q5~oU3J{zXzfQ~<( z?vtESZ-7w3vlkP#kfY<$ZR{|F~eYQaL!%@WRn^)=9Suhl8TN zY)-M#liNT`Tnt;$%w(1( zg}2^JS8f-j6fSZtO&|A5Gw6M zYKO*RxVR%@k##Du;j)qW1$B2tW+d5e%ZiNjk+~9>xOq3Pbf*7D8PDDd&M9 z{!%^(kHTc$I_nSki$=X~yO&{Vq0%Nb4HI))Tv@YL8z`rpSTGZ5f&_?C*bE^|NvfX3 zwMCad0|fcQ`mPfyF!t6C%~Ym3r?Se{+nAksT#IeQYvRYvw7-mxkF^GUjR#v(Fh8Jr zTnQ4)2a?$yLPQB1#DMN6M^NVv&PPNE$q*$7$`C_<;SDb$IjIQ4L_m1M7!}bdpV_h~lgB{l{?ze1J5!l0w-9X3U zGyVmIb>DbJScwTXf=NEc-JS0U+GF7EKz<#3I)kF(Jx)UwuESdYv3k?^F;{QYK(j_* z;Le43=8!W~vmPBsWDrleZqHsB`lL4#S-mw|pYQ2VnS7rKVF!7K3tGhMCss1ANZ0nU zwoV>GTsCu8lS_IU<>BWi2ILHb;)FaX5dqz}t>FN2dc{E6-B)bGb_nMLt(z~EV^Bs= zzW8EIrp^ij$lM_t>IEE&+E%bQl0vl{xQV1~0Zg(GqH?nwQ-%$wjU2jL*jfnIR(K+l z+rFvcKjtjLmwaD+YVNR18KQj~A*&|TsN58f?N z`sBJk#VpbL3`tzVbfI_ekY8p*s6phlB-CGkhdUCw=pot+$OIls^wlm-E)yp{;YHQ{ zvOn$l)r#42pH>%Ie~Pjoe#jk!1actbgIwzI}$(lrU6Co)9xQL(kItc^-ug$3N+ zN)toZeqHnQ(ill$2%O4%yV~Y1LUIV#M`5&emYxdJwM}HOB1(RpS}(zpFc=NJ*nq0z z)Jzl-ea6fF%bWXhv}Ne7YPtg2fMEJL#9LbfE;mTtdt!+AFU!-vZNJkH0I@(B28pvLecY{H*DArFRNkf%@R`Pa}@rm?Qm zZlL8~M%iA^0(N482GD(g_!BSJnkRszhLXunIa>~%rwmsBVQVko3=ycfP$*6$3exc` zRdX3!im3{wq@+o^sZqOV0sB^-$;3OUh8P~(qW?EyPRz80IZ54jFgA+9}W-3;&y@QUu8Qnb3`fPU#*+ymcX zqURlh7>E(hjLDVwT-mLb4{!7;te)HK;$drFN%uKLHbuLbg&+i%WY4j#~h|Vxt1INLW8So(L_McXXgO7AHCm2>eK`_a_wgl+^ zMCpgZ%Bo%K$Nm1|XS-Sqtu%Gh!SHo6Jgb}iE*?>$2Eadh8obE?;t(Mgun@J&I3 zf$2cf`-~vn#gk`p^&#{;hvUtgRhBktk9~HNoIsR(L^wB@LWC_5V)}=fBL}Ro}t*KOD{~mH*p@^f^;qsG_zZ znn3sJWi+zt(UXit*ZmSoD9e(j;lFv-%tifK%7%L;XNUeG0-ptuHU76ChapF)-ndDW zFkO!`&V#mTM~~^Y(`nsJUmywt)?khymcv#;wOuS;0Qp$#Z0vAhI3*kvG?fXe3Ckmf86&t4znPfK40DOkk2q9Y>{k6doM4N=0G z@nYkzu9$cx0o%P-$f)4PlhsOfP?$?rE#<*(LlrXNu!$#FwyLcRMduKx8gxQGN24uQ z7RKn%yEK>g==N^l#+e2*6S$)VT7!D1m^;%BwG(Jxn=N9=*Fa$V<(sd=yZ3|0TCjrZ zsiiCGSS~XOCq#tM){+X7mllexaghdMP}^4`=vsGnjc;f3n_p7T-N=7L`KdOq=9^Sz zTn#8{gU%`{i+zy5HD#$Tl!;Mf^tgGDpSUTzGH(1$W2UlkUJxtqD;ghak ztEOJQZkWo2dC(iD0DmK^=CEd(%5VG`lk9EJO{J3Ii$0Ir3Uk8-iV^(6nKu$i<`Di9r@K zFQ!;FXBGi`FBD|75XU1tFz*`bYRQEMc1qG@Y5 zVvZ@gH(q(_QzV1JO`P#2f_umu-yH4HD69&ecgz5v!RM|D@9Pa!3yXL^8N#t*Zl?&b zuOhm4TvaN8LwIH4$VPM2Tmdjfj>@8$ulxr|2)I^wizpB1V}|JnjP(s9Ok!xGhqiwm z3e4s^PrZPlPz4wY?ElN!>-VAXev2UK--BRbMu82ZX3R^#ehfO2=@UXY`W^~>E;c`Y4<6|DZq~W?QzYtE)dOD zkUxtF%5{VozKQV!Wh_HYZYUUL1XD5!$sk{tF(&ngSK*=ZNLEZPq3N&Y8L!|%JT+%b z;-scI%&^MR8Mf@$o@?HQCmMyAelx#@(; ztyb4)HG&W91!+`qTB_%@4L5f*Cz)9L*kC<%1Kq7#@mw8KI4RiM7FHB;)gGuJKgjW7 zxKT?n4Jd?ciIyc1750xn;*Tz0nVGNst; zRbA|!Qy@zaJb;pCFgVf_mU_|3OMd(o5$o6n;h7UNgVJi7b8=(Pg~3WRmp*$vT9r8aMf`?_kijY9*qyhS?hiFHQmAhqx4k zWTMe7LXER#MdLvO*OUhM5~2F3*}Q_IUHXAPl!1CEYy`E0EEEo({YH=)>83LYe87)r zxkYx6J*Eh4r(H@H3Ykd;yIL6NvOaNkg)YQ!Ao>n7Jo!=HHlR9F>U}JLK0>o;VbU1F zjSoBkSsMg>ke%s0iz6{^rf7fCccC^S)F~`6otj~ndP6RZuHi7?f=ov2))KFmw4|wo zKi0{q1G0-V{{Vj(dO}3+H!WmcHQOq1OfpXs^}*d(f=<4Y#2k7ql*Zcu+AZ?r-KfZh zx!NxU#JCmzCvVo@pHBUk&4?sL?caE_cpEetj>v{c=Eb|M=1>YkD|R9ZA=%_LAvMJ> z^K280mSmSE#!d?F(VscJsjhng@%%{VRv!e222OY~xm~AuQ#{Ys_@BE$>>}m(n3gWK z4f=&9`^kiE8W9b3_L%3NJB9m;|k zUY9SQ0b_4C<$S0gLHJfUt#9bsb*-epuUg281#OJc#j*nO8Ulf+rvHsmv%I#g)_@UZ zA6u@t+-Se15m7})tPc_%;M**jPb~6TtjKV%hrr&X)Rrlb;~iz+Q=KZ7GiQQu>jO)T zc$6~Z(04%xf1fKFKl^lTHu55(Ww4aa4=rSkH(E7=?4sXIgTsy7_H%}ofFz=>@eY1U z7aHe>V*JeuS`7tVB-BM6Y-=N1qEh9Sb9jZiRGq~y(s3_lM1E2yvYiw6%b%$XXmSND zZYjx~au4{Wyc8*UzYyIQhoSYu?6MGw)`@S=2L)%H^LZG=HL5;&!u7@O3TB(wp+0q+qbWt(23#?l3&o1 zdu)^dCgS(B6leE^YS)++mSC*+R?77Tl(TwZdpiYkMz<*piGX(~65AxVH>ir2dH4 zw!4eGy*tK=6W}CKV6qad6P!YA&$_h0&g zCdw1q=PKJc`EAprZSd~;!o5J>Qzd_uE_ZPLB(0ds0}nCsyIg7>zItBRcMgg1Fv{7q z_%0m}M{gtR_@vy1VGhB*RIX3oQ~7{aQ_5bLXeG`QUI~kH6G&tAC17KHS!DYOs(}@e zjZ^1@34@$gL>r_jto3H@gN^8%L!;?2UV)u|L7MBk#OKV|L!MFxN7H|u(mGM_5p?*8 zpe~)nbB)n5x(n`2l^E7SW%GS-1PVAo7BQ9SW8Qg|6FTuxNvtBHqN)?$g0xP-R|!8W zX&HQhW&VulO{VowAzAQzgAPsvRCi8b!b?(yFr9%LzR{&q_LdS=}sc%(-pEdt>W z`Q(=fEI0z`M?D~qeEY%h z%M|A(CwGf(SLYj~9%2R8W87@sxR8*JkU~hf*j4JH-k4=P43;Do8fN@)vtyNSeN?d7f@_Ht)J~b(8)&nLa!yS6wtuvge+wlA38{lW$mYA|j@a zO+xlW(qgSL%%aKdybn}^ZVJuuMw?)*9mztFA9?sma6BLS32e*p!iOrzcUospllr(l zLsW@rTs^N;;G|$fFLy+P zQ@)8@UQ9V)`f<6HE-w);J%yLot%V^850q`D3`0W2E1`#Q`w+krMzhG!{}j8+CFunu z#e<5d86DvQDRGKsBSz9<7s4X@Bbgz%J&`%We2rL!6b>beg>6|4gNEt=`D#6a_F9udtCDAgC| zxg}dx+7r~enD`(xecQC#)^=YIuAe!c0jYMi&p)76BQn}mY1YB-7|<@aq;nBqU(~ zohC}+GxO*aO3n#t4h>#jd?BywPK$lU9vPFDVt=@~qbQuKhD}{y!W+zA%_n zRyKgcE&l(-tW<0)|KVt>Q$X`bTscPqxp5f~6#Q9Zu8N*PgS#zBahO zJ)Lp`xv!}r^tbwdly>??MLto;ptM6!qld+;pcS=)6`*z7S|Y|cjNm)4UVl~{1{Cnv z)9mcJyt7xYW0IxkA8 zwU&O6-Yg(?*+-bHe^1dctyH;7E^gG@C}SHZAct>iCHqb1GR-;oqF$+R=c~w=MNwl} zd(1;|Q3N_Cm`#=ABFYm1#%*>w$@d=Qr?%6MMtmFhV#7C5Qy9`r(BcDE%&)FFDJfb7 zir=kc=44FSC{C6Vw>|woBNy*OGwWMuv?G_`z!^Fo z;o+>ZdH2{gRB|Pe4CsX0j_c#(R*GYqlH|qX)A`Hw-4N8%a&_ zRT2d`|4<_nrg|zKT|@ES`7}E;wAPldMw1uL4Rgwn;nV(y!pc+Pt9{6OPh9nCKl)fE zl?xpABa#bv{LFH)IUSPS{5K-9A?{p_LL7S$!Bx^G7sM5@#7wV|Qb@F0Wc%BS>O$e9 zB(Cof#Zkt?@I5Zk$~V2k)5?w(DuZ^U-#CM30K|shyQU11F1d;ICrrol z6P_7Fc2a||(B4uTIAm0Gh++aUGBmW{seRw&UXPFpwH6@(0Vz=Z2Wjo!F2a8Iyt6di z^%Ccs-m)gHWV*bp{D2B*5RpbDfd~cFL4?61fCBW?2M8a;!GqH{m=SlPrL-;b7K*?u zEzMcyEsjNj3YMs~MN$+-cFd?Ic-CR2+u}j1O5s$#@P~MM#DRKH6jMuni=T>o7{E?l8wu zw*{w?1xx83{0~A~n!#sP1YEsY&rzNcgl~nRQ%RgU;E)DUJ~RK)*?ACjm9MQn_DhKDok6 zvF6(5V$|ZsGm6kshJ~^>Wt1VhFitFY!Xh3?XyM_9gYlvV@@L}!EbZ+Cvc0URVypPc zVyif6?|K#UzF)0liC?UKNi=9$F%F=8(yM|DIX$eGCqQd3^slQ}-R%``WyFIE{+uG> z(gcz3=SE^N;?n!W*e|t{2&bXHPLIbeYCT7s;rq7ifhB5WH%|vM&N8kG+9GH^Blijh z{D8I4O6zWssRj(RsBzi`Aw?;){=M((#5~y4v^>F@<{o5fHx-g~l|>Y|rl5<8BZYcWt+fh+75CVbu5enxhdg;B zS8uzR^?19KPi)^m@aEX-Xkls><`b9u(!vjYSQTW;I@Cshh1iV%t&abG^Wm;uJfiCQ zKo$_<-rT`ELLBtNtYxI0o+g;5}Z<-WB!e^q9=7I@Z$hA?}Ge1+_0ZljRpD2ub4x14Mz zs7Ucar1@!l0-|Inr6`w7SahQ)8VqQJOGT!OSVFam+PtvKaYH{a>oG$`3y zMAJ%f@crm8;m;>#Ov{-XMY^7I8`aY!oXkuz-73AQipx#2XCxh3$dJxF9p~rK3ahQi?VPCCNpUK2z1|1{~C=jNsdCcTxe&jfy znt}=LFkqw81hQfG1W>h*HB$a0cs!;;7-FeND(S0Zg{h~A^|Pd|JNignb+El_m__!fl2 z+Qw*S$5TPf&5|o`e&)}J&&5L|e%}Qz7H62tuNO0047f6u>LP-m;Vi|uj6G@jQE^pE zs+;gc`@mH?One2m(?J@N*!T*;K~PHjQ0x_vq=|N~EO4bd1Y8rb!UnI-;27$xy7?sR zey1?cV&Oet0hoR>`7Z=2HnkmW~*tApcum_s%BG zL$t$I!c`*aW)eB?1o9`Y8=s}7ufvcbp1 zubAR>eS(8}qlihCh7CeFgkq>KjA$_CO-KS&tOy1&D|HdB#^pLDa6eLYII1|W^%^3fZmmW+cU%|O@fZhQHglOrY=~QiDD-A{L(!joMUy?i{di-Wt%SbW;usj$Zw~C=kWj*P8Pxo1jB;w z?hT2c^q$5xJ#WiHHom=Wt45b`{O9oFWS4o7dKpbGzyj9KlYedl;Jw^q#TsRn!yZUo$%Vf7B9h4YgHnTY9M-UJZk?{K6;Cm;FVxW{htB)QqiR?#>r-XUN-w1j26pdz zXWR&lUJRIwjXnm9MiTP0K6$$`_-~_m#(225n}3IP&ZMr-FtNCpF{e;ZKQ-e!-f$0F zrEn?pi1q;C5(>lCFwQCZSb(9+6YqhNVx;2jR)K5EJ6qCqG$%;-c{`EaDCG05HJ9|! zmk#k(LL^zdEpeGNmIB$M0}GXJ4nECG<7i8C8xyeE3uc7{-a_)H2|3v}KZ*Ur8_Wa9 zor#E^{6w!7W-WDWRI#DGq3aoVrLkf?{9?w$bq^APuNED+7jWRnx{I4CO5WCJ$lzz7 zHnLnwM1O31N8AAK!N!EMe_b!>7Bs`cZ_z#X%D8Yi6b||2oOh0!<b_~5R!$;2kxcsIITT^RU^G~Pi_}lxBBYK07*XZ|rS1TJ z(vpT}U!Vhh2s)6hUe5BLdlX{4$%OYEc$@wFT^ToS-9N>m)nd3`@kFusikCNrb)~j< zLdT88w&;%iN{%2qLgIc!?sw#z+9?7#ZVhQgj@WMlzt-d6@r2ShY>v0w0V`6w!z>@v zPSaBJLldlq?gIUU>qZmf|kw*@C@A4IGmWgF}&U99xR~zeB_**D8O)qcgXP2 zV@u+V$ut~6#_@9o?f>b?&{0QiXUjx~)=?z-|3h@J%bqw7Lzrd0w$w!WT z2q(7WIs4h)CX)9{952RVq53ep(`bL@t?OxNJ?=Xt@zHJ&N(byV@RpI)i$7&mzNfHaRwbVn9q9~{9 zE<`zqXl+D6&&!owK6tN}@_g~?rZ=Zk>0P(*@CYd3Y9UZ-tNe+u|DEbp(FJuOHH~O8 zP@I|6!K2^0?fblEK1@VeL}5jS`nlkxo(Cn768>^za5XbCRXbzDjyWzNRd%)r*lH8T zv~X&;=$rwr>W)M6F=7w+$pGr1FtSabXmLN;(7FjvIISC=+7850IQ}lxb9f@Y9`)4(v? z!S}$knJ+s0`b!vwKe=w7nD5Hw1s2Sz_b&9rDb1adpk*0p`S|~GknJ1S*X-i1bxzzh zbRz_ob>t{u=%;YR53Z<$mz0LXe=-|-W#M5$GJ!O02#*COIx7f$Y6xA5!0R{+jg?%n zv9oCq%qC7%(cO@D?^ro4zeRC_UJFT`1IyN6-3T{w(TNp8HaXDix5hK+c|sj#5c?*7 z)Pp#rLiVjxQ(swxo$lo4OKBy2dC5h`r|$d11PS3D%##ZDa7#>5Y`34-m|&8dlRTFa zkt7FNGW&f}!t&_bUqOc@4u&XDeg(qM^feW_rG5SiHH~~z*4`LM@@QkiM{#|_=&I9O zaV>pSnU#i|sbI>BdZrV8gXK2aa}2(rNA0vaOuzYa=-3!78~1Uffqfbw`}Kb7vgTVAvYk_m!c|woPx# z;oQ(i_jORr9?CTjnmTc5F|NcIKQOL49@)mXdXpzuN;}*KoLFpKq9SoplDj4xt7@Hu zRnp89#SH~T6<5T&Da5`|9Sgj^u|!>!njWVgYqFZ1zlF%R>WNfq;fEqjl>d-TWr4si zs`y(iStaPun&V&W9HQ<_BN=N@VIK|8c_SC8vn2+9Hbs6yAa@8u@yQpav^PLAG=-ZX z>S| z)1UD@yv2xpBl*QmOs7BQhfD|cIRasV_#;8`u60mEYuZw^0e6Zge{{D#4))p$Uq=8w zQ#8LIqL1)bturpfbBk!!xuS@Tt95VQfeRWzl$T_CRnUzJ(n@5P9QH_`!hl&F%Uw2$$5xrg|YA zAosxu7#3bR#C%EMK#k#&!LD5T*(U<44bA!HHPYV27@tg5jX)6p z>Ciag6<4-9GJlimunzNDg>_>XX=7Ka%pR9-uC6Y0MY(qB8S+h5?uk=&&7~6Y738hV z-j?(=g1k!JhSDc$(<~yHf$z3x(NvW4ZM@QGrJ&{^ddk^m=f{PkTtLePkwez+_qS-5+mGxLRRa|BEPyr-P zFB_TBc1Tu^Di@A;CFSM@}5c4wSMEw4G-a+7F*HY$+#?UTn zn)I$BNL75_P*bFGgjn(6b4!N4sVNAuo);3_Bcz!e2{yvyfVOypHm z7h7+0Q%0}IwAdq=vu|+;Sr5CF+~Wu?#kPDByvr6h&~{U1Cx=6_8;oakt=iN27Cwg* zF1!%!=a>7+oQ|oq^DAQ4&$Xm|qY3Fh=*<=x`26KNg^tz7UoE;Q3r-AA4jN(_&h>oZ z22V}8Lo%~YYMe7#qhD?^@rPf*Z`td+!;brxHz$1PpFXc~wkEw;7j|d89Ei7QcHDoq zJ$rkXwcbE;2J-^gA~pnUc9H$(Hu3+RH5mOXIsG@zz<(Vvs~zj&sA2k;&`;D$L(0?n zksXok)ze6QBUu5WO!_tu2n0}XBAGu7%%Vx4<2G_d6S9=~T%~#LDpR#s?iQ9l2P%1a zE92{P_qqEfN8a}VEXUErWyv@MynCYKVB(4Iz&q#8!R5{U{Ina0Ba~lc#vcqdCz9w( zkOhgo%Af&?zUgJA8&A!Sl7ccfH~rk!Y^!Pj`enRZN97JP6(6<;E?WLln3}}}r9crpBED>xpqWg3=UtWLP&^z{^p_ahC7Rw7tz3 z#oRE2>Atgt5NCPdD7rDSGNsz}d?C?aJl4O*%?BZwo5^TOi$Mury3lHIaJ{Ydl|jtQ zW-e(fG7UiI*JW-Ab5dSlvd|cU(l{W6BD*Xq+nve?-abtU8Kq7ssYMbo-zONfJcx*IkSvFubJA6=28~V^^CZY%cW9YEg#0diCV% zB%99)q36QH)1m5?l3G)EBl{y`VQyPy@ZbXxs+iYx%*G~fTrzG#Gv6;7OL@V%RF!Ap zLAk7CMTWzaN^60LKvAoTCHSaIn{FI)HRxn(SW~5fWXh{8U2LCZ6?b$E=fDnenci&r zC1_1**l5%V=`n;fwaI5F=9H3T2OW|PdY+sQ`%7EG3U*GbXk9vL(?1^!W>^QQS-&1B ztyi9*?Q4|aN+3@LH$;exFStpl#Hgo5G7@W`FK{!fdQ7M@FzFz(KT%VQ-}@}(`+B}i zU&FsVljVocSa(nUoDKH&n!PZmSdc%uKdM|>Bl?2tK}Cu32L@nwz3~6lnf@r! zM}L2~(GB$)W5;TGg*JU$iXqN-c+JXXj_SZX1f?YHw-0>}(q|4QcEODFRp7e>FaLP- z;w4G>YHuC4>P84<|CjasMtO#liCo^ zY0hJ5iYOr{NgbclRCT*cfpb#4DVupU+s_a1gH9%D-amPx3;7@vEJaD2_(gTPVZv{t z4%{>Q;zxhqApxmZh!A58q|*9?j@KV@FJ=@U+Rq`{p|BIPWgq+snVqN$;{O3>80wQG zK3TZGQX*?tR+fTf31tg$qila}I3wyV71L1e8L?5sD^Y@xe^#_h=M1fyN^ zN8)cDSm_n7k;zAT{;;LgORSu@NCr_T{eqE@m$Z!=i46W9hZ}{04>{&{xo{8yrYB8f z&#BI`w1u!6F1FmvMn>m8iC@q-+Nq1%eC+eo5n@@c^~Cfnj)(Kyt6p)a=y z;Q~%c9@P;65}#?~e@buO&}@*wDoe7Y1FtK_;bdt3vc3gJ&pr7=Em0G@Z9}elWz+~= z14WFybXGKEz%T#YQ0LOs^USHgr>K4ho!dOc9!XxqEgs( z_T?66y$W0I6}Nri8{_&n%=n^B;&M+gZC{!2K4{5BY@-Rv+iHOar1k71n_-+DBy`*% z3r;9uF^ED-L<-lLL9!ny<8BMa^>R!wfg--vXT{PI>_OUYDnQ^5mEC{i-WXlSDj-;=LKdg zesdllPgSy-wnyTZbJf{Wag0hCkI44)osR$e#Q^-p!%qR#tP-7 z_rOGa?0RZn0!uwbd8#s&=!f@ zROV>B9%OFObFdYv=r{!myU8WFC3b95T(L&Olx@D3QZ@|i%Ab-uRbuH@;Y#{)phjJ` zaE=m?B!u8SP@S@Bwe4`4X(=rag=GO6D=4s8PTFiTHVg?gm-pYFpzrD^h=C^6tk3po zSI2E@X|qiiTsFFK66$Aa!$Yu47%Fo4rOEdnH2bfG*MA5UOO?fZnw@T@n!mvKg@s0v zH}i&lPMMf=BcnqIzbY3Kd=^RV^5Hz$yl8t&frec-C^xY(`g@NiII2%VS4E$8`Fy9f zR-P|~6h8)>^jGn7IxdlKQ5>hE4x04xMjsVcfR}gp5_brRET2MsL{1uVyyH|Kbp5Fe zlxM}bX-9@hub=KgT5$|c1J!2-Z9~uVPZ7eJGQY%SNP)xqiOgU3 z+ifY+PuCOD=v*DDn?sUkfuHg{@=A9{wNC`RjKW++>4ZPR%6{a{N|+3izHZdT2IAw` z_=kls__3-{xFmH!7-TC7Lobqy3;?eXxy@RPVK50-PM4e<1iLw~`&;tCeeERN`4y{5 zXIG%zOE%aEWKAfy)t5Yo%_H)F)X z*237(>3^X^&We|k>-&TfGz|tS?8PtNpMTN=nvUVTORNw{olk;sC&Zo1XdMCz0`(@T zMn?CW4DK#UIpdP>F3s6dCg1s&0BjCvG(kmvO6v57Q2( zVh%|crSI2B6Ok9dqmeG7gQ9V$LUhAQ_d5A+7DBlwh(dV$Rss!tCFi4Vq0n)wtCqr@ zu1t<~sHE;%=W(Gon~LGoRW>fLR6B7a3)ajT@ECnZEaCckeLqIoaRg+!LTJ`)aws#H zp7CR0%3tdjPi3T8Cq_=4@&;s22tk7>H6T0U!W5&G02f3cdqIseYQ=0{YyPwcr}Y+^ z)jgE_ke)3v9(HK)Aw5lm8mjccmAvfcofJ3pGzaf*@AMfk_i_H`JAJRa_opS)J8IIb z_;JbpPbk6DOBL2l%?lRuB5SOI$npb0=&@+%iuCeFKIwR~aU{rOvw|CvYW^_zJt0Ws z<_Kj10~(pkzoy?NGut|RJGy{-fUQyp;G>AFQ1UbaCqG!B=86#bj`5I9Lm90+#(ruZ z9~RGDF~!@EUPlb~%X5~5OPksYYato_oXkOQ;Y2!_jTrumT>LZ4u!6M0RH z5EESc?CTu1ScFR(yAn}2@&{IIV*_Yg@6lGV+?j=^7$;Gg5RYcgSbz8C`eq+>PYOy$ zJ83<3W4c;UDODP{du4UE(fsh6?nDz|Fy&kzkq?Dpxi|yz!)hpgyTFpx)n-2RRYUkJ zoC2p7ZdFY)wQyClj{Ro06L6+;Y56t?9M8k7Wvkk`bfSJJbMf7dwGf;)TMFYJ!lv?f z>ao(Okdqvr=s#tvm_kWX?Hks8G)AR%3>c$k?1G*LJtMIz?z(RL!q%OaM(;!mHc6Au zU1kRONtdq)UCw8DqWSiYT^9bWUk#w21O!+L|DU@0zxezC0U!U&<-hly!5@fLjA+b1NfS2V+BHb33O$s{%;TQcX=v|Dv9hk)*9>ondDA#{2;gkpcl}`P7z# z2B`VlW64Vae?a-|?oa3dEBoDMjsUu1pKiY;Q9^rk3tE! z{eP>;2*^r^iYO`5$%wv3_^rmj8wLa|{;6aE?thah_@^2G{-HmW-hb8jm$1P;Ww3A6od` zUwaSd?kAm}2Y?v^T)&ZI|526!=Kc?Gfaf)JFm`m52B^Io+x%OA;ypa2M`3>lpew^* zf6s;Z1AY|qZ{YzH+*Zzx04^C(b1P#3Lqk9dGWs_9rvI&htlLpg4?u?p13LUSMZiDG z0>R%lAm*SCP)}6>Fjb1%S{qB-+FCl>{e9PvZ4aY80Bo)U&=G(bvOkp!fUW#Z*ZdBx z1~5E;QtNNF_xHGuI~e=r0JK%WMf4|BAfPq6zr~gKx7GbU9``Cak1xQw*b(024blHS zo{giEzLnK~v*BOHH&%3jX~l>d2#DY>&ldzp@%x+q8^8ec8{XeP-9eLe z{$J28rT!L8+Sc^HzU@GBexQ25pjQQWVH|$}%aZ+DFnNG>i-4n}v9$p}F_%Qz)==L{ z7+|mt<_6Ax@Vvh_+V^tze>7Ai|Nq^}-*>}%o!>t&fzO6ZBt23g4r?*WLL8)z|!gQsH?I_!|Jg%KoqXrnK`% z*#H3k$!LFz{d`~fz3$E*mEkP@qw>F{PyV|*_#XbfmdYRSsaF3L{(o6Yyl?2e;=vyc zeYXFPhW_;Y|3&}cJ^Xv>{y*R^9sUXaowxiR_B~_$AFv8e{{;KzZHV`n?^%ogz|8ab zC(PdyGydDm_?{p5|Ec8cRTBuJD7=ktkw-{nV;#0k5o;S?!9D>&LLkM0AP6Feg`f{0 zDQpB`k<`JrvB<<-J;OKd%+1!z`DQP}{M_XnsTQvW)#kKd4xjO+0(FK~P*t8f?34gT zNeb{dG5{jMk|Z%xPNd?)Kr$uFk;z0bG4oFYGnNlV6q8Vd`WhQhkz5p#m^vZSc48n^ z)8XlE1_e=c^$WG1no(|j8Tc`PgwP}{$Z2MV1V$=SXvP)gXKtqW)?5PUcJu&?e*#h! zqs>gH(jDQk$9cz8;-w$cc*dE1}qLepfsBCXA@(bAJ66ft0aCq$Wrcq)WXX{0nm+#w=uBj1o9rLyA i;x|p)^~-yfPOPa3(|vBayXKz \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From 3c3b5799f0ea89fbb1386ef0ff8b20857ae1ad40 Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Fri, 10 Jul 2020 13:22:53 -0400 Subject: [PATCH 25/48] chore: Refactor device state and some underlying event model. --- build.gradle | 2 +- .../model/device/state/RecentStateEvent.java | 60 +++--------------- .../request/DeviceStateEventMergeRequest.java | 58 +++++++++++++++++ .../RecentLocationEventCreateRequest.java | 50 +++++++++++++++ .../RecentMeasurementEventCreateRequest.java | 39 ++++++++++++ .../RecentStateEventCreateRequest.java | 63 +++---------------- .../spi/device/event/IDeviceAlert.java | 32 +--------- .../spi/device/event/IDeviceAlertContent.java | 42 +++++++++++++ .../spi/device/event/IDeviceLocation.java | 25 +------- .../device/event/IDeviceLocationContent.java | 35 +++++++++++ .../spi/device/event/IDeviceMeasurement.java | 16 +---- .../event/IDeviceMeasurementContent.java | 28 +++++++++ .../spi/device/state/IRecentAlertEvent.java | 18 ++++++ .../device/state/IRecentLocationEvent.java | 18 ++++++ .../device/state/IRecentMeasurementEvent.java | 18 ++++++ .../spi/device/state/IRecentStateEvent.java | 29 +-------- .../IDeviceStateEventMergeRequest.java | 41 ++++++++++++ .../IRecentLocationEventCreateRequest.java | 16 +++++ .../IRecentMeasurementEventCreateRequest.java | 17 +++++ .../IRecentStateEventCreateRequest.java | 27 +------- 20 files changed, 407 insertions(+), 227 deletions(-) create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/DeviceStateEventMergeRequest.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentLocationEventCreateRequest.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentMeasurementEventCreateRequest.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlertContent.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocationContent.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementContent.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentAlertEvent.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentLocationEvent.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentMeasurementEvent.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateEventMergeRequest.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentLocationEventCreateRequest.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentMeasurementEventCreateRequest.java diff --git a/build.gradle b/build.gradle index 54c4ad1..8ae1f4f 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.beta2' + version = '3.0.0.beta3' repositories { maven { url "https://repo.maven.apache.org/maven2" } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/RecentStateEvent.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/RecentStateEvent.java index 818a44c..7fed386 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/RecentStateEvent.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/RecentStateEvent.java @@ -11,7 +11,6 @@ import java.util.UUID; import com.fasterxml.jackson.annotation.JsonFormat; -import com.sitewhere.spi.device.event.DeviceEventType; import com.sitewhere.spi.device.state.IRecentStateEvent; /** @@ -25,21 +24,12 @@ public class RecentStateEvent implements IRecentStateEvent { /** Device state id */ private UUID deviceStateId; - /** Event type */ - private DeviceEventType eventType; - - /** Event classifier */ - private String classifier; - - /** Most recent value */ - private String value; + /** Reference to event id */ + private UUID eventId; /** Event date */ private Date eventDate; - /** Reference to event id */ - private UUID eventId; - /* * @see com.sitewhere.spi.device.state.IRecentStateEvent#getId() */ @@ -65,39 +55,15 @@ public void setDeviceStateId(UUID deviceStateId) { } /* - * @see com.sitewhere.spi.device.state.IRecentStateEvent#getEventType() - */ - @Override - public DeviceEventType getEventType() { - return eventType; - } - - public void setEventType(DeviceEventType eventType) { - this.eventType = eventType; - } - - /* - * @see com.sitewhere.spi.device.state.IRecentStateEvent#getClassifier() - */ - @Override - public String getClassifier() { - return classifier; - } - - public void setClassifier(String classifier) { - this.classifier = classifier; - } - - /* - * @see com.sitewhere.spi.device.state.IRecentStateEvent#getValue() + * @see com.sitewhere.spi.device.state.IRecentStateEvent#getEventId() */ @Override - public String getValue() { - return value; + public UUID getEventId() { + return eventId; } - public void setValue(String value) { - this.value = value; + public void setEventId(UUID eventId) { + this.eventId = eventId; } /* @@ -112,16 +78,4 @@ public Date getEventDate() { public void setEventDate(Date eventDate) { this.eventDate = eventDate; } - - /* - * @see com.sitewhere.spi.device.state.IRecentStateEvent#getEventId() - */ - @Override - public UUID getEventId() { - return eventId; - } - - public void setEventId(UUID eventId) { - this.eventId = eventId; - } } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/DeviceStateEventMergeRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/DeviceStateEventMergeRequest.java new file mode 100644 index 0000000..c2897b6 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/DeviceStateEventMergeRequest.java @@ -0,0 +1,58 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.rest.model.device.state.request; + +import java.util.ArrayList; +import java.util.List; + +import com.sitewhere.spi.device.event.IDeviceAlert; +import com.sitewhere.spi.device.event.IDeviceLocation; +import com.sitewhere.spi.device.event.IDeviceMeasurement; +import com.sitewhere.spi.device.state.request.IDeviceStateEventMergeRequest; + +/** + * Model for listing events to be merged into device state. + */ +public class DeviceStateEventMergeRequest implements IDeviceStateEventMergeRequest { + + /** List of locations to add */ + private List locations = new ArrayList<>(); + + /** List of measurements to add */ + private List measurements = new ArrayList<>(); + + /** List of alerts to add */ + private List alerts = new ArrayList<>(); + + /* + * @see com.sitewhere.spi.device.state.request.IDeviceStateEventMergeRequest# + * getLocations() + */ + @Override + public List getLocations() { + return locations; + } + + /* + * @see com.sitewhere.spi.device.state.request.IDeviceStateEventMergeRequest# + * getMeasurements() + */ + @Override + public List getMeasurements() { + return measurements; + } + + /* + * @see com.sitewhere.spi.device.state.request.IDeviceStateEventMergeRequest# + * getAlerts() + */ + @Override + public List getAlerts() { + return alerts; + } +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentLocationEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentLocationEventCreateRequest.java new file mode 100644 index 0000000..4ff3bd7 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentLocationEventCreateRequest.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.rest.model.device.state.request; + +import com.sitewhere.spi.device.state.request.IRecentLocationEventCreateRequest; + +public class RecentLocationEventCreateRequest extends RecentStateEventCreateRequest + implements IRecentLocationEventCreateRequest { + + /** Serial version UID */ + private static final long serialVersionUID = 8614328023100102695L; + + /** Latitude */ + private Double latitude; + + /** Longitude */ + private Double longitude; + + /** Elevation */ + private Double elevation; + + public Double getLatitude() { + return latitude; + } + + public void setLatitude(Double latitude) { + this.latitude = latitude; + } + + public Double getLongitude() { + return longitude; + } + + public void setLongitude(Double longitude) { + this.longitude = longitude; + } + + public Double getElevation() { + return elevation; + } + + public void setElevation(Double elevation) { + this.elevation = elevation; + } +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentMeasurementEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentMeasurementEventCreateRequest.java new file mode 100644 index 0000000..bb5b7e5 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentMeasurementEventCreateRequest.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.rest.model.device.state.request; + +import com.sitewhere.spi.device.state.request.IRecentMeasurementEventCreateRequest; + +public class RecentMeasurementEventCreateRequest extends RecentStateEventCreateRequest + implements IRecentMeasurementEventCreateRequest { + + /** Serial version UID */ + private static final long serialVersionUID = -6440987741896116933L; + + /** Name */ + private String name; + + /** Value */ + private Double value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Double getValue() { + return value; + } + + public void setValue(Double value) { + this.value = value; + } +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentStateEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentStateEventCreateRequest.java index ff99484..8dc9dd0 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentStateEventCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentStateEventCreateRequest.java @@ -10,7 +10,6 @@ import java.util.Date; import java.util.UUID; -import com.sitewhere.spi.device.event.DeviceEventType; import com.sitewhere.spi.device.state.request.IRecentStateEventCreateRequest; /** @@ -24,21 +23,12 @@ public class RecentStateEventCreateRequest implements IRecentStateEventCreateReq /** Device state id */ private UUID deviceStateId; - /** Event type */ - private DeviceEventType eventType; - - /** Classifier */ - private String classifier; - - /** Value */ - private String value; + /** Event id */ + private UUID eventId; /** Event date */ private Date eventDate; - /** Event id */ - private UUID eventId; - /* * @see com.sitewhere.spi.device.state.request.IRecentStateEventCreateRequest# * getDeviceStateId() @@ -54,41 +44,15 @@ public void setDeviceStateId(UUID deviceStateId) { /* * @see com.sitewhere.spi.device.state.request.IRecentStateEventCreateRequest# - * getEventType() - */ - @Override - public DeviceEventType getEventType() { - return eventType; - } - - public void setEventType(DeviceEventType eventType) { - this.eventType = eventType; - } - - /* - * @see com.sitewhere.spi.device.state.request.IRecentStateEventCreateRequest# - * getClassifier() - */ - @Override - public String getClassifier() { - return classifier; - } - - public void setClassifier(String classifier) { - this.classifier = classifier; - } - - /* - * @see com.sitewhere.spi.device.state.request.IRecentStateEventCreateRequest# - * getValue() + * getEventId() */ @Override - public String getValue() { - return value; + public UUID getEventId() { + return eventId; } - public void setValue(String value) { - this.value = value; + public void setEventId(UUID eventId) { + this.eventId = eventId; } /* @@ -103,17 +67,4 @@ public Date getEventDate() { public void setEventDate(Date eventDate) { this.eventDate = eventDate; } - - /* - * @see com.sitewhere.spi.device.state.request.IRecentStateEventCreateRequest# - * getEventId() - */ - @Override - public UUID getEventId() { - return eventId; - } - - public void setEventId(UUID eventId) { - this.eventId = eventId; - } } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlert.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlert.java index b7b5ffb..9bcf46d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlert.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlert.java @@ -7,36 +7,10 @@ */ package com.sitewhere.spi.device.event; +import java.io.Serializable; + /** * Interface for an event from a device indiacating and exceptional condition. */ -public interface IDeviceAlert extends IDeviceEvent { - - /** - * Get source of the alert. - * - * @return - */ - AlertSource getSource(); - - /** - * Get severity of alert. - * - * @return - */ - AlertLevel getLevel(); - - /** - * Get the alert type indicator. - * - * @return - */ - String getType(); - - /** - * Get the alert message. - * - * @return - */ - String getMessage(); +public interface IDeviceAlert extends IDeviceEvent, IDeviceAlertContent, Serializable { } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlertContent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlertContent.java new file mode 100644 index 0000000..b8d9964 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlertContent.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.spi.device.event; + +/** + * Content associated with a device alert. + */ +public interface IDeviceAlertContent { + + /** + * Get source of the alert. + * + * @return + */ + AlertSource getSource(); + + /** + * Get severity of alert. + * + * @return + */ + AlertLevel getLevel(); + + /** + * Get the alert type indicator. + * + * @return + */ + String getType(); + + /** + * Get the alert message. + * + * @return + */ + String getMessage(); +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocation.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocation.java index e10339d..0366b5a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocation.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocation.java @@ -7,29 +7,10 @@ */ package com.sitewhere.spi.device.event; +import java.io.Serializable; + /** * Location associated with a device assignment. */ -public interface IDeviceLocation extends IDeviceEvent { - - /** - * Get latitude value. - * - * @return - */ - Double getLatitude(); - - /** - * Get longitude value. - * - * @return - */ - Double getLongitude(); - - /** - * Get elevation value. - * - * @return - */ - Double getElevation(); +public interface IDeviceLocation extends IDeviceEvent, IDeviceLocationContent, Serializable { } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocationContent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocationContent.java new file mode 100644 index 0000000..e454d74 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocationContent.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.spi.device.event; + +/** + * Content associated with a device location. + */ +public interface IDeviceLocationContent { + + /** + * Get latitude value. + * + * @return + */ + Double getLatitude(); + + /** + * Get longitude value. + * + * @return + */ + Double getLongitude(); + + /** + * Get elevation value. + * + * @return + */ + Double getElevation(); +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurement.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurement.java index adff25f..3c0762c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurement.java @@ -12,19 +12,5 @@ /** * Measurement associated with a device assignment at a point in time. */ -public interface IDeviceMeasurement extends IDeviceEvent, Serializable { - - /** - * Get measurement name. - * - * @return - */ - String getName(); - - /** - * Get measurement value. - * - * @return - */ - Double getValue(); +public interface IDeviceMeasurement extends IDeviceEvent, IDeviceMeasurementContent, Serializable { } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementContent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementContent.java new file mode 100644 index 0000000..dcf5f96 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementContent.java @@ -0,0 +1,28 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.spi.device.event; + +/** + * Content associated with a device measurement. + */ +public interface IDeviceMeasurementContent { + + /** + * Get measurement name. + * + * @return + */ + String getName(); + + /** + * Get measurement value. + * + * @return + */ + Double getValue(); +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentAlertEvent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentAlertEvent.java new file mode 100644 index 0000000..047f5a9 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentAlertEvent.java @@ -0,0 +1,18 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.spi.device.state; + +import java.io.Serializable; + +import com.sitewhere.spi.device.event.IDeviceAlertContent; + +/** + * Annotation of a recent device alert event. + */ +public interface IRecentAlertEvent extends IRecentStateEvent, IDeviceAlertContent, Serializable { +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentLocationEvent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentLocationEvent.java new file mode 100644 index 0000000..2e11a22 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentLocationEvent.java @@ -0,0 +1,18 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.spi.device.state; + +import java.io.Serializable; + +import com.sitewhere.spi.device.event.IDeviceLocationContent; + +/** + * Annotation of a recent device location event. + */ +public interface IRecentLocationEvent extends IRecentStateEvent, IDeviceLocationContent, Serializable { +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentMeasurementEvent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentMeasurementEvent.java new file mode 100644 index 0000000..4d99158 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentMeasurementEvent.java @@ -0,0 +1,18 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.spi.device.state; + +import java.io.Serializable; + +import com.sitewhere.spi.device.event.IDeviceMeasurementContent; + +/** + * Annotation of a recent device measurement event. + */ +public interface IRecentMeasurementEvent extends IRecentStateEvent, IDeviceMeasurementContent, Serializable { +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentStateEvent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentStateEvent.java index 7e874c7..a855d8b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentStateEvent.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentStateEvent.java @@ -10,10 +10,8 @@ import java.util.Date; import java.util.UUID; -import com.sitewhere.spi.device.event.DeviceEventType; - /** - * Pointer to a recent event related to device state. + * Base interface for recent device state events. */ public interface IRecentStateEvent { @@ -32,25 +30,11 @@ public interface IRecentStateEvent { UUID getDeviceStateId(); /** - * Get type of event. - * - * @return - */ - DeviceEventType getEventType(); - - /** - * Uniquely classifies an event within a type (e.g. mx name or alert type). - * - * @return - */ - String getClassifier(); - - /** - * Get a string representation of the latest value. + * Get unique event id. * * @return */ - String getValue(); + UUID getEventId(); /** * Get date event occurred. @@ -58,11 +42,4 @@ public interface IRecentStateEvent { * @return */ Date getEventDate(); - - /** - * Get unique event id. - * - * @return - */ - UUID getEventId(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateEventMergeRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateEventMergeRequest.java new file mode 100644 index 0000000..0edb03d --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateEventMergeRequest.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.spi.device.state.request; + +import java.util.List; + +import com.sitewhere.spi.device.event.IDeviceAlert; +import com.sitewhere.spi.device.event.IDeviceLocation; +import com.sitewhere.spi.device.event.IDeviceMeasurement; + +/** + * Request for merging events into the device state. + */ +public interface IDeviceStateEventMergeRequest { + + /** + * Get locations to be merged. + * + * @return + */ + List getLocations(); + + /** + * Get measurements to be merged. + * + * @return + */ + List getMeasurements(); + + /** + * Get alerts to be merged. + * + * @return + */ + List getAlerts(); +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentLocationEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentLocationEventCreateRequest.java new file mode 100644 index 0000000..5806c16 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentLocationEventCreateRequest.java @@ -0,0 +1,16 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.spi.device.state.request; + +import com.sitewhere.spi.device.event.IDeviceLocationContent; + +/** + * Request for adding a recent device location to device state. + */ +public interface IRecentLocationEventCreateRequest extends IRecentStateEventCreateRequest, IDeviceLocationContent { +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentMeasurementEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentMeasurementEventCreateRequest.java new file mode 100644 index 0000000..cd32f50 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentMeasurementEventCreateRequest.java @@ -0,0 +1,17 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.spi.device.state.request; + +import com.sitewhere.spi.device.event.IDeviceMeasurementContent; + +/** + * Request for adding a recent measurement to device state. + */ +public interface IRecentMeasurementEventCreateRequest + extends IRecentStateEventCreateRequest, IDeviceMeasurementContent { +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentStateEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentStateEventCreateRequest.java index 3706a8c..d6f217e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentStateEventCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentStateEventCreateRequest.java @@ -11,8 +11,6 @@ import java.util.Date; import java.util.UUID; -import com.sitewhere.spi.device.event.DeviceEventType; - /** * Request used to create/update a recent device state event. */ @@ -26,25 +24,11 @@ public interface IRecentStateEventCreateRequest extends Serializable { UUID getDeviceStateId(); /** - * Get type of event. - * - * @return - */ - DeviceEventType getEventType(); - - /** - * Uniquely classifies an event within a type (e.g. mx name or alert type). - * - * @return - */ - String getClassifier(); - - /** - * Get a string representation of the latest value. + * Get unique event id. * * @return */ - String getValue(); + UUID getEventId(); /** * Get date event occurred. @@ -52,11 +36,4 @@ public interface IRecentStateEventCreateRequest extends Serializable { * @return */ Date getEventDate(); - - /** - * Get unique event id. - * - * @return - */ - UUID getEventId(); } From afc4e252cbb76ae072603b19b94e14dcc1a5c346 Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Sun, 12 Jul 2020 09:55:45 -0400 Subject: [PATCH 26/48] feat: Mx and location event more precise types. --- build.gradle | 2 +- .../device/DeviceAssignmentRestTests.java | 197 +++++++++--------- .../rest/client/device/DeviceRestTests.java | 5 +- .../java/com/sitewhere/test/StompTest.java | 3 +- .../model/device/event/DeviceLocation.java | 34 ++- .../model/device/event/DeviceMeasurement.java | 10 +- .../request/DeviceLocationCreateRequest.java | 53 +++-- .../DeviceMeasurementCreateRequest.java | 13 +- .../RecentLocationEventCreateRequest.java | 20 +- .../RecentMeasurementEventCreateRequest.java | 8 +- .../model/user/request/UserCreateRequest.java | 61 ++++++ .../sitewhere/spi/device/IDeviceActions.java | 5 +- .../device/event/IDeviceLocationContent.java | 8 +- .../event/IDeviceMeasurementContent.java | 4 +- .../request/IDeviceLocationCreateRequest.java | 8 +- .../IDeviceMeasurementCreateRequest.java | 3 +- 16 files changed, 268 insertions(+), 166 deletions(-) diff --git a/build.gradle b/build.gradle index cee6f67..e7e2f38 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.beta3' + version = '3.0.0.beta4' repositories { maven { url "https://repo.maven.apache.org/maven2" } diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceAssignmentRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceAssignmentRestTests.java index 7b0b25e..4285cd0 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceAssignmentRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceAssignmentRestTests.java @@ -10,6 +10,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -50,14 +51,15 @@ * @author Jorge Villaverde * */ -public class DeviceAssignmentRestTests extends AbstractWithLabelCRUDRestTest { +public class DeviceAssignmentRestTests + extends AbstractWithLabelCRUDRestTest { private static final String deviceToken = "15737-UNO-7576364"; - + private static final String customerToken = "acme"; - - private static final String areaToken = "southeast"; - + + private static final String areaToken = "southeast"; + private static final String assetToken = "derek.adams@sitewhere.com"; @Override @@ -71,15 +73,16 @@ protected String knownEntityToken() { @Override protected DeviceAssignmentCreateRequest buildCreateRequest(String token) { - DeviceAssignmentCreateRequest.Builder builder = - new DeviceAssignmentCreateRequest.Builder(deviceToken, customerToken, areaToken, assetToken); + DeviceAssignmentCreateRequest.Builder builder = new DeviceAssignmentCreateRequest.Builder(deviceToken, + customerToken, areaToken, assetToken); DeviceAssignmentCreateRequest request = builder.build(); request.setToken(token); return request; } @Override - protected MarshaledDeviceAssignment createEntity(DeviceAssignmentCreateRequest createRequest) throws SiteWhereException { + protected MarshaledDeviceAssignment createEntity(DeviceAssignmentCreateRequest createRequest) + throws SiteWhereException { return getClient().createDeviceAssignment(getTenatAuthentication(), createRequest); } @@ -98,15 +101,16 @@ protected MarshaledDeviceAssignment findEntityByToken(String token) throws SiteW @Override protected DeviceAssignmentCreateRequest buildUpdateRequest(String token) throws SiteWhereException { - DeviceAssignmentCreateRequest.Builder builder = - new DeviceAssignmentCreateRequest.Builder(deviceToken, customerToken, areaToken, assetToken); + DeviceAssignmentCreateRequest.Builder builder = new DeviceAssignmentCreateRequest.Builder(deviceToken, + customerToken, areaToken, assetToken); DeviceAssignmentCreateRequest request = builder.build(); request.setToken(token); return request; } @Override - protected MarshaledDeviceAssignment updateEntity(String token, DeviceAssignmentCreateRequest updateRequest) throws SiteWhereException { + protected MarshaledDeviceAssignment updateEntity(String token, DeviceAssignmentCreateRequest updateRequest) + throws SiteWhereException { return getClient().updateDeviceAssignment(getTenatAuthentication(), token, updateRequest); } @@ -142,35 +146,37 @@ protected byte[] getLabelForEntity(String token, String generatorId) throws Site @Test public void testListAlerts() throws SiteWhereException { Calendar cal = Calendar.getInstance(); - + cal.setTime(new Date()); cal.add(Calendar.YEAR, -1); - + Date startDate = cal.getTime(); Date endDate = new Date(); - + DateRangeSearchCriteria searchCriteria = new DateRangeSearchCriteria(1, 10, startDate, endDate); - SearchResults alerts = getClient() - .listAlertsForDeviceAssignment(getTenatAuthentication(), knownEntityToken(), searchCriteria); - + SearchResults alerts = getClient().listAlertsForDeviceAssignment(getTenatAuthentication(), + knownEntityToken(), searchCriteria); + assertNotNull(alerts); } @Test public void testCreateAlert() throws SiteWhereException { - DeviceAlertCreateRequest.Builder builder = new DeviceAlertCreateRequest.Builder("egine.overheat", "Engine Overheat"); - + DeviceAlertCreateRequest.Builder builder = new DeviceAlertCreateRequest.Builder("egine.overheat", + "Engine Overheat"); + DeviceAlertCreateRequest request = builder.error().trackState().build(); - - DeviceAlertWithAsset alert = getClient().createAlertForDeviceAssignment( - getTenatAuthentication(), knownEntityToken(), request); - + + DeviceAlertWithAsset alert = getClient().createAlertForDeviceAssignment(getTenatAuthentication(), + knownEntityToken(), request); + assertNotNull(alert); } @Test public void testReleaseAssignment() throws SiteWhereException { - MarshaledDeviceAssignment assignment = getClient().releaseDeviceAssignment(getTenatAuthentication(), knownEntityToken()); + MarshaledDeviceAssignment assignment = getClient().releaseDeviceAssignment(getTenatAuthentication(), + knownEntityToken()); assertNotNull(assignment); assertEquals(DeviceAssignmentStatus.Released, assignment.getStatus()); } @@ -178,17 +184,18 @@ public void testReleaseAssignment() throws SiteWhereException { @Test public void testListCommandInvocations() throws SiteWhereException { Calendar cal = Calendar.getInstance(); - + cal.setTime(new Date()); cal.add(Calendar.YEAR, -1); - + Date startDate = cal.getTime(); Date endDate = new Date(); - + DateRangeSearchCriteria searchCriteria = new DateRangeSearchCriteria(1, 10, startDate, endDate); SearchResults commandInvocations = getClient() - .listCommandInvocationsForDeviceAssignment(getTenatAuthentication(), knownEntityToken(), false, searchCriteria); - + .listCommandInvocationsForDeviceAssignment(getTenatAuthentication(), knownEntityToken(), false, + searchCriteria); + assertNotNull(commandInvocations); } @@ -198,19 +205,19 @@ public void testCreateCommandInvocations() throws SiteWhereException { String target = "Assignment"; String initiatorId = "REST"; - DeviceCommandInvocationCreateRequest.Builder builder = - new DeviceCommandInvocationCreateRequest.Builder(commandToken, target); + DeviceCommandInvocationCreateRequest.Builder builder = new DeviceCommandInvocationCreateRequest.Builder( + commandToken, target); DeviceCommandInvocationCreateRequest request = builder.build(); - + request.setInitiatorId(initiatorId); request.setInitiator(CommandInitiator.REST); - + DeviceCommandInvocation commandInvocation = getClient() .createCommandInvocationForDeviceAssignment(getTenatAuthentication(), knownEntityToken(), request); - + assertNotNull(commandInvocation); } - + @Test public void testScheduleCommandInvocation() throws SiteWhereException { String commandToken = "ping"; @@ -218,19 +225,19 @@ public void testScheduleCommandInvocation() throws SiteWhereException { String initiatorId = "REST"; String scheduleToken = "de305d54-75b4-431b-adb2-eb6b9e546014"; - DeviceCommandInvocationCreateRequest.Builder builder = - new DeviceCommandInvocationCreateRequest.Builder(commandToken, target); + DeviceCommandInvocationCreateRequest.Builder builder = new DeviceCommandInvocationCreateRequest.Builder( + commandToken, target); DeviceCommandInvocationCreateRequest request = builder.build(); - + request.setInitiatorId(initiatorId); request.setInitiator(CommandInitiator.REST); - - ScheduledJob scheduleJob = getClient() - .scheduleCommandInvocation(getTenatAuthentication(), knownEntityToken(), scheduleToken, request); - + + ScheduledJob scheduleJob = getClient().scheduleCommandInvocation(getTenatAuthentication(), knownEntityToken(), + scheduleToken, request); + assertNotNull(scheduleJob); } - + @Test public void testListLocations() throws SiteWhereException { Calendar cal = Calendar.getInstance(); @@ -247,14 +254,15 @@ public void testListLocations() throws SiteWhereException { assertNotNull(locations); } - + @Test public void testCreateLocation() throws SiteWhereException { - DeviceLocationCreateRequest.Builder builder = new DeviceLocationCreateRequest.Builder(-27.3313291,-58.961281); + DeviceLocationCreateRequest.Builder builder = new DeviceLocationCreateRequest.Builder( + new BigDecimal("-27.3313291"), new BigDecimal("-58.961281")); DeviceLocationCreateRequest request = builder.build(); - - DeviceLocationWithAsset location = getClient() - .createLocationForDeviceAssignment(getTenatAuthentication(), knownEntityToken(), request); + + DeviceLocationWithAsset location = getClient().createLocationForDeviceAssignment(getTenatAuthentication(), + knownEntityToken(), request); assertNotNull(location); } @@ -275,19 +283,19 @@ public void testListMeasurements() throws SiteWhereException { assertNotNull(measurements); } - + @Test public void testCreateMeasurement() throws SiteWhereException { DeviceMeasurementCreateRequest.Builder builder = new DeviceMeasurementCreateRequest.Builder(); - builder.measurement("engine.temp", 50.0); + builder.measurement("engine.temp", new BigDecimal("50.0")); DeviceMeasurementCreateRequest request = builder.build(); - + DeviceMeasurementWithAsset measurement = getClient() .createMeasurementForDeviceAssignment(getTenatAuthentication(), knownEntityToken(), request); assertNotNull(measurement); } - + @Test public void testListMeasurementsSeries() throws SiteWhereException { Calendar cal = Calendar.getInstance(); @@ -299,16 +307,17 @@ public void testListMeasurementsSeries() throws SiteWhereException { Date endDate = new Date(); DateRangeSearchCriteria searchCriteria = new DateRangeSearchCriteria(1, 10, startDate, endDate); - - List> series = getClient() - .listMeasurementsForDeviceAssignmentAsChartSeries(getTenatAuthentication(), knownEntityToken(), searchCriteria); + + List> series = getClient().listMeasurementsForDeviceAssignmentAsChartSeries( + getTenatAuthentication(), knownEntityToken(), searchCriteria); assertNotNull(series); } @Test public void testMarkMissingAssignment() throws SiteWhereException { - MarshaledDeviceAssignment assignment = getClient().markMissingDeviceAssignment(getTenatAuthentication(), knownEntityToken()); + MarshaledDeviceAssignment assignment = getClient().markMissingDeviceAssignment(getTenatAuthentication(), + knownEntityToken()); assertNotNull(assignment); assertEquals(DeviceAssignmentStatus.Missing, assignment.getStatus()); } @@ -335,7 +344,7 @@ public void testCreateCommandResponse() throws SiteWhereException { DeviceCommandResponseCreateRequest request = new DeviceCommandResponseCreateRequest(); request.setResponse("ok"); request.setOriginatingEventId(UUID.randomUUID()); - + DeviceCommandResponseWithAsset commandResponse = getClient() .createCommandResponseForDeviceAssignment(getTenatAuthentication(), knownEntityToken(), request); @@ -366,95 +375,95 @@ public void testCreateStateChange() throws SiteWhereException { request.setAttribute("Attr"); request.setType("t1"); request.setUpdateState(true); - + DeviceStateChangeWithAsset stateChange = getClient() .createStateChangeForDeviceAssignment(getTenatAuthentication(), knownEntityToken(), request); assertNotNull(stateChange); } - + @Test public void testBulkListAlertsForDeviceAssignments() throws SiteWhereException { DeviceAssignmentBulkRequest request = new DeviceAssignmentBulkRequest(); - + request.setDeviceAssignmentTokens(new ArrayList()); request.getDeviceAssignmentTokens().add(knownEntityToken()); - - SearchResults bulk = - getClient().bulkListAlertsForDeviceAssignments(getTenatAuthentication(), request); - assertNotNull(bulk); + + SearchResults bulk = getClient() + .bulkListAlertsForDeviceAssignments(getTenatAuthentication(), request); + assertNotNull(bulk); } - + @Test public void testBulkListCommandInvocationsForDeviceAssignments() throws SiteWhereException { DeviceAssignmentBulkRequest request = new DeviceAssignmentBulkRequest(); - + request.setDeviceAssignmentTokens(new ArrayList()); request.getDeviceAssignmentTokens().add(knownEntityToken()); - - SearchResults bulk = - getClient().bulkListCommandInvocationsForDeviceAssignments(getTenatAuthentication(), request); - assertNotNull(bulk); + + SearchResults bulk = getClient() + .bulkListCommandInvocationsForDeviceAssignments(getTenatAuthentication(), request); + assertNotNull(bulk); } @Test public void testBulkListLocationsForDeviceAssignments() throws SiteWhereException { DeviceAssignmentBulkRequest request = new DeviceAssignmentBulkRequest(); - + request.setDeviceAssignmentTokens(new ArrayList()); request.getDeviceAssignmentTokens().add(knownEntityToken()); - - SearchResults bulk = - getClient().bulkListLocationsForDeviceAssignments(getTenatAuthentication(), request); - assertNotNull(bulk); + + SearchResults bulk = getClient() + .bulkListLocationsForDeviceAssignments(getTenatAuthentication(), request); + assertNotNull(bulk); } @Test public void testBulkListMeasurementsForDeviceAssignments() throws SiteWhereException { DeviceAssignmentBulkRequest request = new DeviceAssignmentBulkRequest(); - + request.setDeviceAssignmentTokens(new ArrayList()); request.getDeviceAssignmentTokens().add(knownEntityToken()); - - SearchResults bulk = - getClient().bulkListMeasurementsForDeviceAssignments(getTenatAuthentication(), request); - assertNotNull(bulk); + + SearchResults bulk = getClient() + .bulkListMeasurementsForDeviceAssignments(getTenatAuthentication(), request); + assertNotNull(bulk); } - + @Test public void testBulkListMeasurementsForDeviceAssignmentsAsChartSeries() throws SiteWhereException { DeviceAssignmentBulkRequest request = new DeviceAssignmentBulkRequest(); - + request.setDeviceAssignmentTokens(new ArrayList()); request.getDeviceAssignmentTokens().add(knownEntityToken()); - + Map>> series = getClient() .bulkListMeasurementsForDeviceAssignmentsAsChartSeries(getTenatAuthentication(), request); assertNotNull(series); } - + @Test public void testBulkListCommandResponsesForDeviceAssignments() throws SiteWhereException { DeviceAssignmentBulkRequest request = new DeviceAssignmentBulkRequest(); - + request.setDeviceAssignmentTokens(new ArrayList()); request.getDeviceAssignmentTokens().add(knownEntityToken()); - - SearchResults bulk = - getClient().bulkListCommandResponsesForDeviceAssignments(getTenatAuthentication(), request); - assertNotNull(bulk); + + SearchResults bulk = getClient() + .bulkListCommandResponsesForDeviceAssignments(getTenatAuthentication(), request); + assertNotNull(bulk); } @Test public void testBulkListStateChangesForDeviceAssignments() throws SiteWhereException { DeviceAssignmentBulkRequest request = new DeviceAssignmentBulkRequest(); - + request.setDeviceAssignmentTokens(new ArrayList()); request.getDeviceAssignmentTokens().add(knownEntityToken()); - - SearchResults bulk = - getClient().bulkListStateChangesForDeviceAssignments(getTenatAuthentication(), request); - assertNotNull(bulk); + + SearchResults bulk = getClient() + .bulkListStateChangesForDeviceAssignments(getTenatAuthentication(), request); + assertNotNull(bulk); } } diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceRestTests.java index ff03d23..ca999c8 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceRestTests.java @@ -10,6 +10,8 @@ import static org.junit.Assert.assertNotNull; +import java.math.BigDecimal; + import org.junit.Test; import com.sitewhere.rest.client.AbstractWithLabelCRUDRestTest; @@ -136,7 +138,8 @@ public void testAddMultipleEventsForDevice() throws SiteWhereException { } private IDeviceLocationCreateRequest deviceLocationCreateRequest() { - DeviceLocationCreateRequest.Builder builder = new DeviceLocationCreateRequest.Builder(22.2, 33.3); + DeviceLocationCreateRequest.Builder builder = new DeviceLocationCreateRequest.Builder(new BigDecimal("22.2"), + new BigDecimal("33.3")); return builder.build(); } diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/test/StompTest.java b/sitewhere-java-client/src/test/java/com/sitewhere/test/StompTest.java index 9633113..6f5f8e7 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/test/StompTest.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/test/StompTest.java @@ -7,6 +7,7 @@ */ package com.sitewhere.test; +import java.math.BigDecimal; import java.util.Date; import org.apache.activemq.transport.stomp.StompConnection; @@ -57,7 +58,7 @@ protected String createMeasurementsJson(String hardwareId) throws Exception { DeviceMeasurementCreateRequest request = new DeviceMeasurementCreateRequest(); request.setEventDate(new Date()); request.setName("engine.temp"); - request.setValue(98.76); + request.setValue(new BigDecimal("98.76")); batch.getMeasurements().add(request); return MAPPER.writeValueAsString(batch); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceLocation.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceLocation.java index 0891eff..02fc38b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceLocation.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceLocation.java @@ -8,6 +8,7 @@ package com.sitewhere.rest.model.device.event; import java.io.Serializable; +import java.math.BigDecimal; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; @@ -25,54 +26,51 @@ public class DeviceLocation extends DeviceEvent implements IDeviceLocation, Seri private static final long serialVersionUID = -6279278445519407648L; /** Latitude value */ - private Double latitude; + private BigDecimal latitude; /** Longitude value */ - private Double longitude; + private BigDecimal longitude; /** Elevation value */ - private Double elevation; + private BigDecimal elevation; public DeviceLocation() { super(DeviceEventType.Location); } /* - * (non-Javadoc) - * - * @see com.sitewhere.spi.device.IDeviceLocation#getLatitude() + * @see com.sitewhere.spi.device.event.IDeviceLocationContent#getLatitude() */ - public Double getLatitude() { + @Override + public BigDecimal getLatitude() { return latitude; } - public void setLatitude(Double latitude) { + public void setLatitude(BigDecimal latitude) { this.latitude = latitude; } /* - * (non-Javadoc) - * - * @see com.sitewhere.spi.device.IDeviceLocation#getLongitude() + * @see com.sitewhere.spi.device.event.IDeviceLocationContent#getLongitude() */ - public Double getLongitude() { + @Override + public BigDecimal getLongitude() { return longitude; } - public void setLongitude(Double longitude) { + public void setLongitude(BigDecimal longitude) { this.longitude = longitude; } /* - * (non-Javadoc) - * - * @see com.sitewhere.spi.device.IDeviceLocation#getElevation() + * @see com.sitewhere.spi.device.event.IDeviceLocationContent#getElevation() */ - public Double getElevation() { + @Override + public BigDecimal getElevation() { return elevation; } - public void setElevation(Double elevation) { + public void setElevation(BigDecimal elevation) { this.elevation = elevation; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceMeasurement.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceMeasurement.java index 48ecf75..91880d5 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceMeasurement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceMeasurement.java @@ -7,6 +7,8 @@ */ package com.sitewhere.rest.model.device.event; +import java.math.BigDecimal; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; @@ -27,7 +29,7 @@ public class DeviceMeasurement extends DeviceEvent implements IDeviceMeasurement private String name; /** Measurement value */ - private Double value; + private BigDecimal value; public DeviceMeasurement() { super(DeviceEventType.Measurement); @@ -46,14 +48,14 @@ public void setName(String name) { } /* - * @see com.sitewhere.spi.device.event.IDeviceMeasurement#getValue() + * @see com.sitewhere.spi.device.event.IDeviceMeasurementContent#getValue() */ @Override - public Double getValue() { + public BigDecimal getValue() { return value; } - public void setValue(Double value) { + public void setValue(BigDecimal value) { this.value = value; } } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceLocationCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceLocationCreateRequest.java index 7093c19..39717aa 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceLocationCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceLocationCreateRequest.java @@ -8,6 +8,7 @@ package com.sitewhere.rest.model.device.event.request; import java.io.Serializable; +import java.math.BigDecimal; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonInclude; @@ -27,57 +28,54 @@ public class DeviceLocationCreateRequest extends DeviceEventCreateRequest private static final long serialVersionUID = -7160866457228082338L; /** Latitude value */ - private Double latitude; + private BigDecimal latitude; /** Longitude value */ - private Double longitude; + private BigDecimal longitude; /** Elevation value */ - private Double elevation; + private BigDecimal elevation; public DeviceLocationCreateRequest() { setEventType(DeviceEventType.Location); } /* - * (non-Javadoc) - * - * @see - * com.sitewhere.spi.device.request.IDeviceLocationCreateRequest#getLatitude () + * @see com.sitewhere.spi.device.event.request.IDeviceLocationCreateRequest# + * getLatitude() */ - public Double getLatitude() { + @Override + public BigDecimal getLatitude() { return latitude; } - public void setLatitude(Double latitude) { + public void setLatitude(BigDecimal latitude) { this.latitude = latitude; } /* - * (non-Javadoc) - * - * @see com.sitewhere.spi.device.request.IDeviceLocationCreateRequest# + * @see com.sitewhere.spi.device.event.request.IDeviceLocationCreateRequest# * getLongitude() */ - public Double getLongitude() { + @Override + public BigDecimal getLongitude() { return longitude; } - public void setLongitude(Double longitude) { + public void setLongitude(BigDecimal longitude) { this.longitude = longitude; } /* - * (non-Javadoc) - * - * @see com.sitewhere.spi.device.request.IDeviceLocationCreateRequest# + * @see com.sitewhere.spi.device.event.request.IDeviceLocationCreateRequest# * getElevation() */ - public Double getElevation() { + @Override + public BigDecimal getElevation() { return elevation; } - public void setElevation(Double elevation) { + public void setElevation(BigDecimal elevation) { this.elevation = elevation; } @@ -85,17 +83,28 @@ public static class Builder extends DeviceEventCreateRequest.Builder()); diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceMeasurementCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceMeasurementCreateRequest.java index 508b840..1639793 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceMeasurementCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceMeasurementCreateRequest.java @@ -7,6 +7,7 @@ */ package com.sitewhere.rest.model.device.event.request; +import java.math.BigDecimal; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -31,7 +32,7 @@ public class DeviceMeasurementCreateRequest extends DeviceEventCreateRequest private String name; /** Measurement value */ - private double value; + private BigDecimal value; public DeviceMeasurementCreateRequest() { setEventType(DeviceEventType.Measurement); @@ -55,11 +56,11 @@ public void setName(String name) { * getValue() */ @Override - public double getValue() { + public BigDecimal getValue() { return value; } - public void setValue(double value) { + public void setValue(BigDecimal value) { this.value = value; } @@ -71,6 +72,12 @@ public Builder() { } public Builder measurement(String name, double value) { + request.setName(name); + request.setValue(new BigDecimal(value)); + return this; + } + + public Builder measurement(String name, BigDecimal value) { request.setName(name); request.setValue(value); return this; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentLocationEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentLocationEventCreateRequest.java index 4ff3bd7..d427077 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentLocationEventCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentLocationEventCreateRequest.java @@ -7,6 +7,8 @@ */ package com.sitewhere.rest.model.device.state.request; +import java.math.BigDecimal; + import com.sitewhere.spi.device.state.request.IRecentLocationEventCreateRequest; public class RecentLocationEventCreateRequest extends RecentStateEventCreateRequest @@ -16,35 +18,35 @@ public class RecentLocationEventCreateRequest extends RecentStateEventCreateRequ private static final long serialVersionUID = 8614328023100102695L; /** Latitude */ - private Double latitude; + private BigDecimal latitude; /** Longitude */ - private Double longitude; + private BigDecimal longitude; /** Elevation */ - private Double elevation; + private BigDecimal elevation; - public Double getLatitude() { + public BigDecimal getLatitude() { return latitude; } - public void setLatitude(Double latitude) { + public void setLatitude(BigDecimal latitude) { this.latitude = latitude; } - public Double getLongitude() { + public BigDecimal getLongitude() { return longitude; } - public void setLongitude(Double longitude) { + public void setLongitude(BigDecimal longitude) { this.longitude = longitude; } - public Double getElevation() { + public BigDecimal getElevation() { return elevation; } - public void setElevation(Double elevation) { + public void setElevation(BigDecimal elevation) { this.elevation = elevation; } } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentMeasurementEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentMeasurementEventCreateRequest.java index bb5b7e5..7edd363 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentMeasurementEventCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentMeasurementEventCreateRequest.java @@ -7,6 +7,8 @@ */ package com.sitewhere.rest.model.device.state.request; +import java.math.BigDecimal; + import com.sitewhere.spi.device.state.request.IRecentMeasurementEventCreateRequest; public class RecentMeasurementEventCreateRequest extends RecentStateEventCreateRequest @@ -19,7 +21,7 @@ public class RecentMeasurementEventCreateRequest extends RecentStateEventCreateR private String name; /** Value */ - private Double value; + private BigDecimal value; public String getName() { return name; @@ -29,11 +31,11 @@ public void setName(String name) { this.name = name; } - public Double getValue() { + public BigDecimal getValue() { return value; } - public void setValue(Double value) { + public void setValue(BigDecimal value) { this.value = value; } } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java index d7a69df..e877e4b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java @@ -7,13 +7,18 @@ */ package com.sitewhere.rest.model.user.request; +import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.sitewhere.rest.model.common.request.PersistentEntityCreateRequest; import com.sitewhere.spi.user.AccountStatus; +import com.sitewhere.spi.user.IRole; +import com.sitewhere.spi.user.IUser; import com.sitewhere.spi.user.request.IUserCreateRequest; /** @@ -115,4 +120,60 @@ public List getRoles() { public void setRoles(List roles) { this.roles = roles; } + + public static class Builder { + + /** Request being built */ + private UserCreateRequest request = new UserCreateRequest(); + + public Builder(String username, String password, String firstName, String lastName) { + request.setUsername(username); + request.setPassword(password); + request.setFirstName(firstName); + request.setLastName(lastName); + } + + public Builder(IUser existing) { + request.setUsername(existing.getUsername()); + request.setPassword(existing.getHashedPassword()); + request.setFirstName(existing.getFirstName()); + request.setLastName(existing.getLastName()); + request.setStatus(existing.getStatus()); + request.setRoles(existing.getRoles().stream().map(IRole::getRole).collect(Collectors.toList())); + request.setMetadata(existing.getMetadata()); + } + + public Builder withStatus(AccountStatus status) { + request.setStatus(status); + return this; + } + + public Builder withRole(IRole role) { + if (request.getRoles() == null) { + request.setRoles(new ArrayList<>()); + } + request.getRoles().add(role.getRole()); + return this; + } + + public Builder withRoles(List roles) { + if (request.getRoles() == null) { + request.setRoles(new ArrayList<>()); + } + request.getRoles().addAll(roles.stream().map(IRole::getRole).collect(Collectors.toList())); + return this; + } + + public Builder metadata(String name, String value) { + if (request.getMetadata() == null) { + request.setMetadata(new HashMap()); + } + request.getMetadata().put(name, value); + return this; + } + + public UserCreateRequest build() { + return request; + } + } } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceActions.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceActions.java index 1b2ddf9..ebe07fa 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceActions.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceActions.java @@ -7,6 +7,7 @@ */ package com.sitewhere.spi.device; +import java.math.BigDecimal; import java.util.Map; import com.sitewhere.spi.SiteWhereException; @@ -26,8 +27,8 @@ public interface IDeviceActions { * @param updateState * @throws SiteWhereException */ - public void createLocation(IDeviceAssignment assignment, double latitude, double longitude, double elevation, - boolean updateState) throws SiteWhereException; + public void createLocation(IDeviceAssignment assignment, BigDecimal latitude, BigDecimal longitude, + BigDecimal elevation, boolean updateState) throws SiteWhereException; /** * Send command to a device. diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocationContent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocationContent.java index e454d74..f86f39d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocationContent.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocationContent.java @@ -7,6 +7,8 @@ */ package com.sitewhere.spi.device.event; +import java.math.BigDecimal; + /** * Content associated with a device location. */ @@ -17,19 +19,19 @@ public interface IDeviceLocationContent { * * @return */ - Double getLatitude(); + BigDecimal getLatitude(); /** * Get longitude value. * * @return */ - Double getLongitude(); + BigDecimal getLongitude(); /** * Get elevation value. * * @return */ - Double getElevation(); + BigDecimal getElevation(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementContent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementContent.java index dcf5f96..e92c95d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementContent.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementContent.java @@ -7,6 +7,8 @@ */ package com.sitewhere.spi.device.event; +import java.math.BigDecimal; + /** * Content associated with a device measurement. */ @@ -24,5 +26,5 @@ public interface IDeviceMeasurementContent { * * @return */ - Double getValue(); + BigDecimal getValue(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceLocationCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceLocationCreateRequest.java index e1d62ec..f7746ed 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceLocationCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceLocationCreateRequest.java @@ -7,6 +7,8 @@ */ package com.sitewhere.spi.device.event.request; +import java.math.BigDecimal; + /** * Interface for arguments needed to create a device location. */ @@ -17,19 +19,19 @@ public interface IDeviceLocationCreateRequest extends IDeviceEventCreateRequest * * @return */ - Double getLatitude(); + BigDecimal getLatitude(); /** * Get longitude. * * @return */ - Double getLongitude(); + BigDecimal getLongitude(); /** * Get elevation.s * * @return */ - Double getElevation(); + BigDecimal getElevation(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceMeasurementCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceMeasurementCreateRequest.java index bbfb558..28a8083 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceMeasurementCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceMeasurementCreateRequest.java @@ -8,6 +8,7 @@ package com.sitewhere.spi.device.event.request; import java.io.Serializable; +import java.math.BigDecimal; /** * Interface for arguments needed to create a device measurement. @@ -26,5 +27,5 @@ public interface IDeviceMeasurementCreateRequest extends IDeviceEventCreateReque * * @return */ - double getValue(); + BigDecimal getValue(); } \ No newline at end of file From 04d63f047edca25f0b72684c3584588636b764e6 Mon Sep 17 00:00:00 2001 From: Luciano Baez Date: Mon, 13 Jul 2020 15:52:29 -0300 Subject: [PATCH 27/48] fix user create request. --- build.gradle | 14 +++++++------- .../rest/model/user/request/UserCreateRequest.java | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index e7e2f38..38887de 100644 --- a/build.gradle +++ b/build.gradle @@ -11,8 +11,8 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.beta4' - + version = '3.0.0.beta5' + repositories { maven { url "https://repo.maven.apache.org/maven2" } } @@ -20,28 +20,28 @@ allprojects { subprojects { apply plugin: 'eclipse' - + apply plugin: "com.github.hierynomus.license" license { header rootProject.file('HEADER') include "**/*.java" } - + // Choose Java settings. apply plugin: 'java' sourceCompatibility = 1.8 targetCompatibility = 1.8 - + tasks.withType(Javadoc) { options.addStringOption('Xdoclint:none', '-quiet') options.addStringOption('encoding', 'UTF-8') options.addStringOption('charSet', 'UTF-8') } - + // Common dependencies used for all projects. dependencies { compile platform('io.quarkus:quarkus-bom:1.2.1.Final') - + testCompile group: 'junit', name: 'junit' } test { diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java index e877e4b..986c2b7 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java @@ -46,7 +46,7 @@ public class UserCreateRequest extends PersistentEntityCreateRequest implements /** User status */ private AccountStatus status; - /** User authorities */ + /** User roles */ private List roles; /* @@ -114,7 +114,7 @@ public void setStatus(AccountStatus status) { */ @Override public List getRoles() { - return Collections.unmodifiableList(this.roles); + return this.roles; } public void setRoles(List roles) { From d346b6ab554e8e380ab2c134f0661648863f4404 Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Mon, 13 Jul 2020 17:26:59 -0400 Subject: [PATCH 28/48] fix: Fix NPE --- build.gradle | 2 +- .../sitewhere/rest/model/user/request/UserCreateRequest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e7e2f38..32e7785 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.beta4' + version = '3.0.0.beta5' repositories { maven { url "https://repo.maven.apache.org/maven2" } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java index e877e4b..5ea2350 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java @@ -47,7 +47,7 @@ public class UserCreateRequest extends PersistentEntityCreateRequest implements private AccountStatus status; /** User authorities */ - private List roles; + private List roles = new ArrayList<>(); /* * @see com.sitewhere.spi.user.request.IUserCreateRequest#getUsername() From 536db685d3d920044937b7bb331ff73df5ed826f Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Mon, 13 Jul 2020 18:45:04 -0400 Subject: [PATCH 29/48] feat: Add min/max values/dates for recent measurements. --- .../device/state/IRecentMeasurementEvent.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentMeasurementEvent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentMeasurementEvent.java index 4d99158..5b5fc16 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentMeasurementEvent.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentMeasurementEvent.java @@ -8,6 +8,8 @@ package com.sitewhere.spi.device.state; import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; import com.sitewhere.spi.device.event.IDeviceMeasurementContent; @@ -15,4 +17,32 @@ * Annotation of a recent device measurement event. */ public interface IRecentMeasurementEvent extends IRecentStateEvent, IDeviceMeasurementContent, Serializable { + + /** + * Get maximum value for measurement. + * + * @return + */ + BigDecimal getMaxValue(); + + /** + * Get date when maximum value occurred. + * + * @return + */ + Date getMaxValueDate(); + + /** + * Get minimum value for measurement. + * + * @return + */ + BigDecimal getMinValue(); + + /** + * Get date when minimum value occurred. + * + * @return + */ + Date getMinValueDate(); } From 04d38f5677c693a67c9bb11543b71e1ebe7dc3f0 Mon Sep 17 00:00:00 2001 From: jorgevillaverde-sitewhere Date: Tue, 14 Jul 2020 08:35:44 -0300 Subject: [PATCH 30/48] fix: build access to roles. --- .../rest/model/user/request/UserCreateRequest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java index 986c2b7..a64eaf6 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java @@ -114,7 +114,7 @@ public void setStatus(AccountStatus status) { */ @Override public List getRoles() { - return this.roles; + return Collections.unmodifiableList(this.roles); } public void setRoles(List roles) { @@ -149,18 +149,18 @@ public Builder withStatus(AccountStatus status) { } public Builder withRole(IRole role) { - if (request.getRoles() == null) { - request.setRoles(new ArrayList<>()); + if (request.roles == null) { + request.roles = new ArrayList<>(); } - request.getRoles().add(role.getRole()); + request.roles.add(role.getRole()); return this; } public Builder withRoles(List roles) { - if (request.getRoles() == null) { - request.setRoles(new ArrayList<>()); + if (request.roles == null) { + request.roles = new ArrayList<>(); } - request.getRoles().addAll(roles.stream().map(IRole::getRole).collect(Collectors.toList())); + request.roles.addAll(roles.stream().map(IRole::getRole).collect(Collectors.toList())); return this; } From 62b135b3a0bbd6bc1a573bf770515bddebd437bc Mon Sep 17 00:00:00 2001 From: jorgevillaverde-sitewhere Date: Tue, 14 Jul 2020 08:54:15 -0300 Subject: [PATCH 31/48] fix: spaces --- build.gradle | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index c5b1c57..8cff45b 100644 --- a/build.gradle +++ b/build.gradle @@ -10,12 +10,12 @@ buildscript { apply plugin: 'distribution' allprojects { - group = 'com.sitewhere' - version = '3.0.0.beta5' + group = 'com.sitewhere' + version = '3.0.0.beta5' - repositories { - maven { url "https://repo.maven.apache.org/maven2" } - } + repositories { + maven { url "https://repo.maven.apache.org/maven2" } + } } subprojects { @@ -24,13 +24,13 @@ subprojects { apply plugin: "com.github.hierynomus.license" license { header rootProject.file('HEADER') - include "**/*.java" + include "**/*.java" } - // Choose Java settings. - apply plugin: 'java' - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + // Choose Java settings. + apply plugin: 'java' + sourceCompatibility = 1.8 + targetCompatibility = 1.8 tasks.withType(Javadoc) { options.addStringOption('Xdoclint:none', '-quiet') @@ -38,13 +38,13 @@ subprojects { options.addStringOption('charSet', 'UTF-8') } - // Common dependencies used for all projects. - dependencies { - compile platform('io.quarkus:quarkus-bom:1.2.1.Final') + // Common dependencies used for all projects. + dependencies { + compile platform('io.quarkus:quarkus-bom:1.2.1.Final') - testCompile group: 'junit', name: 'junit' - } + testCompile group: 'junit', name: 'junit' + } test { - exclude '**/*' + exclude '**/*' } } \ No newline at end of file From d85e3bb3e1181903a90ee0bb4d1ea91269fc43c5 Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Tue, 14 Jul 2020 15:25:30 -0400 Subject: [PATCH 32/48] fix: Support created date for tenant. --- .../com/sitewhere/rest/model/tenant/Tenant.java | 16 ++++++++++++++++ .../java/com/sitewhere/spi/tenant/ITenant.java | 8 ++++++++ 2 files changed, 24 insertions(+) diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/Tenant.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/Tenant.java index b4c40f0..b7ef69a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/Tenant.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/Tenant.java @@ -8,6 +8,7 @@ package com.sitewhere.rest.model.tenant; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; @@ -60,6 +61,9 @@ public class Tenant implements ITenant { /** Metadata map */ private Map metadata; + /** Created date */ + private Date createdDate; + /* * @see com.sitewhere.spi.tenant.ITenant#getToken() */ @@ -207,4 +211,16 @@ public Map getMetadata() { public void setMetadata(Map metadata) { this.metadata = metadata; } + + /* + * @see com.sitewhere.spi.tenant.ITenant#getCreatedDate() + */ + @Override + public Date getCreatedDate() { + return createdDate; + } + + public void setCreatedDate(Date createdDate) { + this.createdDate = createdDate; + } } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenant.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenant.java index c8d6aeb..02204e4 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenant.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenant.java @@ -8,6 +8,7 @@ package com.sitewhere.spi.tenant; import java.io.Serializable; +import java.util.Date; import java.util.List; import com.sitewhere.spi.common.IColorProvider; @@ -61,4 +62,11 @@ public interface ITenant extends IColorProvider, IIconProvider, IImageProvider, * @return */ String getDatasetTemplateId(); + + /** + * Get date tenant was created. + * + * @return + */ + Date getCreatedDate(); } \ No newline at end of file From 14f71dc6fd60e60f27be8bb3074e5c49e0a8970b Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Tue, 14 Jul 2020 15:54:06 -0400 Subject: [PATCH 33/48] chore: Bump version. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8cff45b..2a37c9a 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.beta5' + version = '3.0.0.beta6' repositories { maven { url "https://repo.maven.apache.org/maven2" } From cb7d42f52ab264ac19a3eaf0c21dec104a743d23 Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Fri, 17 Jul 2020 11:24:40 -0400 Subject: [PATCH 34/48] feat: Support concept of device summary. Condensed format with key data for devices/assignments. Compatible with RDB optimizations for better performance in high-level device list views. --- build.gradle | 2 +- .../model/device/DeviceAssignmentSummary.java | 169 ++++++++++++++++++ .../rest/model/device/DeviceSummary.java | 109 +++++++++++ .../device/marshaling/MarshaledDevice.java | 7 +- .../marshaling/MarshaledDeviceAssignment.java | 44 +++++ .../spi/device/IDeviceAssignmentSummary.java | 103 +++++++++++ .../sitewhere/spi/device/IDeviceSummary.java | 69 +++++++ 7 files changed, 498 insertions(+), 5 deletions(-) create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignmentSummary.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceSummary.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignmentSummary.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceSummary.java diff --git a/build.gradle b/build.gradle index 2a37c9a..c2c9909 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.beta6' + version = '3.0.0.beta7' repositories { maven { url "https://repo.maven.apache.org/maven2" } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignmentSummary.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignmentSummary.java new file mode 100644 index 0000000..c1d6a17 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignmentSummary.java @@ -0,0 +1,169 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.rest.model.device; + +import java.util.Date; +import java.util.UUID; + +import com.sitewhere.rest.model.common.PersistentEntity; +import com.sitewhere.spi.device.DeviceAssignmentStatus; +import com.sitewhere.spi.device.IDeviceAssignmentSummary; + +/** + * Summarizes device and directly related entities such as device type and + * assignments. + */ +public class DeviceAssignmentSummary extends PersistentEntity implements IDeviceAssignmentSummary { + + /** Serial version UID */ + private static final long serialVersionUID = -6857027037347179506L; + + /** Id of assigned customer */ + private UUID customerId; + + /** Customer name */ + private String customerName; + + /** Customer image url */ + private String customerImageUrl; + + /** Id of assigned area */ + private UUID areaId; + + /** Area name */ + private String areaName; + + /** Area image url */ + private String areaImageUrl; + + /** Id of assigned asset */ + private UUID assetId; + + /** Asset name */ + private String assetName; + + /** Asset image url */ + private String assetImageUrl; + + /** Assignment status */ + private DeviceAssignmentStatus status; + + /** Assignment start date */ + private Date activeDate; + + /** Assignment end date */ + private Date releasedDate; + + @Override + public UUID getCustomerId() { + return customerId; + } + + public void setCustomerId(UUID customerId) { + this.customerId = customerId; + } + + @Override + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + @Override + public String getCustomerImageUrl() { + return customerImageUrl; + } + + public void setCustomerImageUrl(String customerImageUrl) { + this.customerImageUrl = customerImageUrl; + } + + @Override + public UUID getAreaId() { + return areaId; + } + + public void setAreaId(UUID areaId) { + this.areaId = areaId; + } + + @Override + public String getAreaName() { + return areaName; + } + + public void setAreaName(String areaName) { + this.areaName = areaName; + } + + @Override + public String getAreaImageUrl() { + return areaImageUrl; + } + + public void setAreaImageUrl(String areaImageUrl) { + this.areaImageUrl = areaImageUrl; + } + + @Override + public UUID getAssetId() { + return assetId; + } + + public void setAssetId(UUID assetId) { + this.assetId = assetId; + } + + @Override + public String getAssetName() { + return assetName; + } + + public void setAssetName(String assetName) { + this.assetName = assetName; + } + + @Override + public String getAssetImageUrl() { + return assetImageUrl; + } + + public void setAssetImageUrl(String assetImageUrl) { + this.assetImageUrl = assetImageUrl; + } + + @Override + public DeviceAssignmentStatus getStatus() { + return status; + } + + public void setStatus(DeviceAssignmentStatus status) { + this.status = status; + } + + @Override + public Date getActiveDate() { + return activeDate; + } + + public void setActiveDate(Date activeDate) { + this.activeDate = activeDate; + } + + @Override + public Date getReleasedDate() { + return releasedDate; + } + + public void setReleasedDate(Date releasedDate) { + this.releasedDate = releasedDate; + } +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceSummary.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceSummary.java new file mode 100644 index 0000000..39b260e --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceSummary.java @@ -0,0 +1,109 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.rest.model.device; + +import java.util.List; +import java.util.UUID; + +import com.sitewhere.rest.model.common.PersistentEntity; +import com.sitewhere.spi.device.IDeviceAssignmentSummary; +import com.sitewhere.spi.device.IDeviceSummary; + +/** + * Device summary information including device type details and device + * assignment summaries. + */ +public class DeviceSummary extends PersistentEntity implements IDeviceSummary { + + /** Serial version UID */ + private static final long serialVersionUID = -4556277285202746345L; + + /** Device type id */ + private UUID deviceTypeId; + + /** Device type name */ + private String deviceTypeName; + + /** Device type image url */ + private String deviceTypeImageUrl; + + /** Parent device id (if nested) */ + private UUID parentDeviceId; + + /** Comments */ + private String comments; + + /** Status indicator */ + private String status; + + /** Device assignment summaries */ + private List deviceAssignmentSummaries; + + @Override + public UUID getDeviceTypeId() { + return deviceTypeId; + } + + public void setDeviceTypeId(UUID deviceTypeId) { + this.deviceTypeId = deviceTypeId; + } + + @Override + public String getDeviceTypeName() { + return deviceTypeName; + } + + public void setDeviceTypeName(String deviceTypeName) { + this.deviceTypeName = deviceTypeName; + } + + @Override + public String getDeviceTypeImageUrl() { + return deviceTypeImageUrl; + } + + public void setDeviceTypeImageUrl(String deviceTypeImageUrl) { + this.deviceTypeImageUrl = deviceTypeImageUrl; + } + + @Override + public UUID getParentDeviceId() { + return parentDeviceId; + } + + public void setParentDeviceId(UUID parentDeviceId) { + this.parentDeviceId = parentDeviceId; + } + + @Override + public String getComments() { + return comments; + } + + public void setComments(String comments) { + this.comments = comments; + } + + @Override + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + @Override + public List getDeviceAssignmentSummaries() { + return deviceAssignmentSummaries; + } + + public void setDeviceAssignmentSummaries(List deviceAssignmentSummaries) { + this.deviceAssignmentSummaries = deviceAssignmentSummaries; + } +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDevice.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDevice.java index 11fe89d..6fa2566 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDevice.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDevice.java @@ -10,7 +10,6 @@ import java.util.List; import com.sitewhere.rest.model.device.Device; -import com.sitewhere.rest.model.device.DeviceAssignment; import com.sitewhere.rest.model.device.DeviceType; /** @@ -25,7 +24,7 @@ public class MarshaledDevice extends Device { private DeviceType deviceType; /** Current device assignment */ - private List activeDeviceAssignments; + private List activeDeviceAssignments; public DeviceType getDeviceType() { return deviceType; @@ -35,11 +34,11 @@ public void setDeviceType(DeviceType deviceType) { this.deviceType = deviceType; } - public List getActiveDeviceAssignments() { + public List getActiveDeviceAssignments() { return activeDeviceAssignments; } - public void setActiveDeviceAssignments(List activeDeviceAssignments) { + public void setActiveDeviceAssignments(List activeDeviceAssignments) { this.activeDeviceAssignments = activeDeviceAssignments; } } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceAssignment.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceAssignment.java index 9c69979..c196ac1 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceAssignment.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceAssignment.java @@ -31,6 +31,18 @@ public class MarshaledDeviceAssignment extends DeviceAssignment { /** Associated asset */ private MarshaledAsset asset; + /** Customer name */ + private String customerName; + + /** Customer image url */ + private String customerImageUrl; + + /** Area name */ + private String areaName; + + /** Area image url */ + private String areaImageUrl; + /** Associated asset name */ private String assetName; @@ -69,6 +81,38 @@ public void setAsset(MarshaledAsset asset) { this.asset = asset; } + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerImageUrl() { + return customerImageUrl; + } + + public void setCustomerImageUrl(String customerImageUrl) { + this.customerImageUrl = customerImageUrl; + } + + public String getAreaName() { + return areaName; + } + + public void setAreaName(String areaName) { + this.areaName = areaName; + } + + public String getAreaImageUrl() { + return areaImageUrl; + } + + public void setAreaImageUrl(String areaImageUrl) { + this.areaImageUrl = areaImageUrl; + } + public String getAssetName() { return assetName; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignmentSummary.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignmentSummary.java new file mode 100644 index 0000000..e190041 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignmentSummary.java @@ -0,0 +1,103 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.spi.device; + +import java.util.Date; +import java.util.UUID; + +import com.sitewhere.spi.common.IPersistentEntity; + +/** + * Summarizes basic details for a device assignment such as associated entities. + */ +public interface IDeviceAssignmentSummary extends IPersistentEntity { + + /** + * Get unqiue id for customer assigned to device. + * + * @return + */ + UUID getCustomerId(); + + /** + * Get customer name. + * + * @return + */ + String getCustomerName(); + + /** + * Get customer image url. + * + * @return + */ + String getCustomerImageUrl(); + + /** + * Get unique id for area assigned to device. + * + * @return + */ + UUID getAreaId(); + + /** + * Get area name. + * + * @return + */ + String getAreaName(); + + /** + * Get area image url. + * + * @return + */ + String getAreaImageUrl(); + + /** + * Get asset id. + * + * @return + */ + UUID getAssetId(); + + /** + * Get asset name. + * + * @return + */ + String getAssetName(); + + /** + * Get asset image url. + * + * @return + */ + String getAssetImageUrl(); + + /** + * Get the device assignment status. + * + * @return + */ + DeviceAssignmentStatus getStatus(); + + /** + * Get the date/time at which the assignment was made active. + * + * @return + */ + Date getActiveDate(); + + /** + * Get the date/time at which the assignment was released. + * + * @return + */ + Date getReleasedDate(); +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceSummary.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceSummary.java new file mode 100644 index 0000000..e31aac1 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceSummary.java @@ -0,0 +1,69 @@ +/* + * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * + * The software in this package is published under the terms of the CPAL v1.0 + * license, a copy of which has been included with this distribution in the + * LICENSE.txt file. + */ +package com.sitewhere.spi.device; + +import java.util.List; +import java.util.UUID; + +import com.sitewhere.spi.common.IPersistentEntity; + +/** + * Summarizes device and directly related entities such as device type and + * assignments. + */ +public interface IDeviceSummary extends IPersistentEntity { + + /** + * Get unique id for associated device type. + * + * @return + */ + UUID getDeviceTypeId(); + + /** + * Get device type name. + * + * @return + */ + String getDeviceTypeName(); + + /** + * Get device type image url. + * + * @return + */ + String getDeviceTypeImageUrl(); + + /** + * If contained by a parent device, returns the parent device id. + * + * @return + */ + UUID getParentDeviceId(); + + /** + * Get device comments. + * + * @return + */ + String getComments(); + + /** + * Get most recent device status. + * + * @return + */ + String getStatus(); + + /** + * Get list of device assignment summaries. + * + * @return + */ + List getDeviceAssignmentSummaries(); +} From aa01a4ea2fb5dd0deb5838e9f8ecffcd68785d6e Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Fri, 17 Jul 2020 12:22:12 -0400 Subject: [PATCH 35/48] chore: Remove extra fields from marshaled device assignment. Users can ask for complete asset object via flag or use new device summaries API to get nested data more efficiently. --- .../marshaling/MarshaledDeviceAssignment.java | 66 ------------------- 1 file changed, 66 deletions(-) diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceAssignment.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceAssignment.java index c196ac1..1e41aa1 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceAssignment.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceAssignment.java @@ -31,24 +31,6 @@ public class MarshaledDeviceAssignment extends DeviceAssignment { /** Associated asset */ private MarshaledAsset asset; - /** Customer name */ - private String customerName; - - /** Customer image url */ - private String customerImageUrl; - - /** Area name */ - private String areaName; - - /** Area image url */ - private String areaImageUrl; - - /** Associated asset name */ - private String assetName; - - /** Associated asset image */ - private String assetImageUrl; - public MarshaledDevice getDevice() { return device; } @@ -80,52 +62,4 @@ public MarshaledAsset getAsset() { public void setAsset(MarshaledAsset asset) { this.asset = asset; } - - public String getCustomerName() { - return customerName; - } - - public void setCustomerName(String customerName) { - this.customerName = customerName; - } - - public String getCustomerImageUrl() { - return customerImageUrl; - } - - public void setCustomerImageUrl(String customerImageUrl) { - this.customerImageUrl = customerImageUrl; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getAreaImageUrl() { - return areaImageUrl; - } - - public void setAreaImageUrl(String areaImageUrl) { - this.areaImageUrl = areaImageUrl; - } - - public String getAssetName() { - return assetName; - } - - public void setAssetName(String assetName) { - this.assetName = assetName; - } - - public String getAssetImageUrl() { - return assetImageUrl; - } - - public void setAssetImageUrl(String assetImageUrl) { - this.assetImageUrl = assetImageUrl; - } } \ No newline at end of file From 9b67fc40348e0ee34e831f82fcc2b1c796a67b38 Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Wed, 22 Jul 2020 17:22:51 -0400 Subject: [PATCH 36/48] feat: Update event APIs for better performance --- build.gradle | 2 +- .../device/event/DeviceEventContext.java | 132 ++++++++++++++++-- .../event/kafka/PreprocessedEventPayload.java | 36 ++--- ...ayload.java => ProcessedEventPayload.java} | 7 +- .../spi/device/event/IDeviceEventContext.java | 53 ++++++- .../kafka/IPreprocessedEventPayload.java | 16 +-- ...yload.java => IProcessedEventPayload.java} | 5 +- 7 files changed, 190 insertions(+), 61 deletions(-) rename sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/{EnrichedEventPayload.java => ProcessedEventPayload.java} (82%) rename sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/{IEnrichedEventPayload.java => IProcessedEventPayload.java} (81%) diff --git a/build.gradle b/build.gradle index c2c9909..3024ca7 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.beta7' + version = '3.0.0.beta8' repositories { maven { url "https://repo.maven.apache.org/maven2" } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventContext.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventContext.java index c30f887..26ab9f0 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventContext.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventContext.java @@ -20,6 +20,15 @@ */ public class DeviceEventContext implements IDeviceEventContext { + /** Event originator */ + private String originator; + + /** Event source id */ + private String sourceId; + + /** Device token */ + private String deviceToken; + /** Device id */ private UUID deviceId; @@ -35,11 +44,59 @@ public class DeviceEventContext implements IDeviceEventContext { /** Device metadata */ private Map deviceMetadata; + /** Device assignment id */ + private UUID deviceAssignmentId; + + /** Customer id */ + private UUID customerId; + + /** Area id */ + private UUID areaId; + + /** Asset id */ + private UUID assetId; + /** Device assignment status */ - private DeviceAssignmentStatus assignmentStatus; + private DeviceAssignmentStatus deviceAssignmentStatus; /** Device assignment metadata */ - private Map assignmentMetadata; + private Map deviceAssignmentMetadata; + + /* + * @see com.sitewhere.spi.device.event.IDeviceEventContext#getOriginator() + */ + @Override + public String getOriginator() { + return originator; + } + + public void setOriginator(String originator) { + this.originator = originator; + } + + /* + * @see com.sitewhere.spi.device.event.IDeviceEventContext#getSourceId() + */ + @Override + public String getSourceId() { + return sourceId; + } + + public void setSourceId(String sourceId) { + this.sourceId = sourceId; + } + + /* + * @see com.sitewhere.spi.device.event.IDeviceEventContext#getDeviceToken() + */ + @Override + public String getDeviceToken() { + return deviceToken; + } + + public void setDeviceToken(String deviceToken) { + this.deviceToken = deviceToken; + } /* * @see com.sitewhere.spi.device.event.IDeviceEventContext#getDeviceId() @@ -102,27 +159,78 @@ public void setDeviceMetadata(Map deviceMetadata) { } /* - * @see com.sitewhere.spi.device.event.IDeviceEventContext#getAssignmentStatus() + * @see + * com.sitewhere.spi.device.event.IDeviceEventContext#getDeviceAssignmentId() */ @Override - public DeviceAssignmentStatus getAssignmentStatus() { - return assignmentStatus; + public UUID getDeviceAssignmentId() { + return deviceAssignmentId; } - public void setAssignmentStatus(DeviceAssignmentStatus assignmentStatus) { - this.assignmentStatus = assignmentStatus; + public void setDeviceAssignmentId(UUID deviceAssignmentId) { + this.deviceAssignmentId = deviceAssignmentId; + } + + /* + * @see com.sitewhere.spi.device.event.IDeviceEventContext#getCustomerId() + */ + @Override + public UUID getCustomerId() { + return customerId; + } + + public void setCustomerId(UUID customerId) { + this.customerId = customerId; + } + + /* + * @see com.sitewhere.spi.device.event.IDeviceEventContext#getAreaId() + */ + @Override + public UUID getAreaId() { + return areaId; + } + + public void setAreaId(UUID areaId) { + this.areaId = areaId; + } + + /* + * @see com.sitewhere.spi.device.event.IDeviceEventContext#getAssetId() + */ + @Override + public UUID getAssetId() { + return assetId; + } + + public void setAssetId(UUID assetId) { + this.assetId = assetId; } /* * @see - * com.sitewhere.spi.device.event.IDeviceEventContext#getAssignmentMetadata() + * com.sitewhere.spi.device.event.IDeviceEventContext#getDeviceAssignmentStatus( + * ) + */ + @Override + public DeviceAssignmentStatus getDeviceAssignmentStatus() { + return deviceAssignmentStatus; + } + + public void setDeviceAssignmentStatus(DeviceAssignmentStatus deviceAssignmentStatus) { + this.deviceAssignmentStatus = deviceAssignmentStatus; + } + + /* + * @see com.sitewhere.spi.device.event.IDeviceEventContext# + * getDeviceAssignmentMetadata() */ @Override - public Map getAssignmentMetadata() { - return assignmentMetadata; + public Map getDeviceAssignmentMetadata() { + return deviceAssignmentMetadata; } - public void setAssignmentMetadata(Map assignmentMetadata) { - this.assignmentMetadata = assignmentMetadata; + public void setDeviceAssignmentMetadata(Map deviceAssignmentMetadata) { + this.deviceAssignmentMetadata = deviceAssignmentMetadata; } } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/PreprocessedEventPayload.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/PreprocessedEventPayload.java index 934eb27..acafb59 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/PreprocessedEventPayload.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/PreprocessedEventPayload.java @@ -7,45 +7,27 @@ */ package com.sitewhere.rest.model.device.event.kafka; -import java.util.UUID; - +import com.sitewhere.spi.device.event.IDeviceEventContext; import com.sitewhere.spi.device.event.kafka.IPreprocessedEventPayload; /** - * Payload for inbound event which has been decoded and pre-processed by inbound - * processing. + * Event payload before persistence. */ public class PreprocessedEventPayload extends DecodedEventPayload implements IPreprocessedEventPayload { - /** Device id */ - private UUID deviceId; - - /** Device assignment id */ - private UUID deviceAssignmentId; - - /* - * @see - * com.sitewhere.spi.device.event.kafka.IPreprocessedEventPayload#getDeviceId() - */ - @Override - public UUID getDeviceId() { - return deviceId; - } - - public void setDeviceId(UUID deviceId) { - this.deviceId = deviceId; - } + /** Event context */ + private IDeviceEventContext eventContext; /* * @see com.sitewhere.spi.device.event.kafka.IPreprocessedEventPayload# - * getDeviceAssignmentId() + * getEventContext() */ @Override - public UUID getDeviceAssignmentId() { - return deviceAssignmentId; + public IDeviceEventContext getEventContext() { + return eventContext; } - public void setDeviceAssignmentId(UUID deviceAssignmentId) { - this.deviceAssignmentId = deviceAssignmentId; + public void setEventContext(IDeviceEventContext eventContext) { + this.eventContext = eventContext; } } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/EnrichedEventPayload.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/ProcessedEventPayload.java similarity index 82% rename from sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/EnrichedEventPayload.java rename to sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/ProcessedEventPayload.java index 69a27db..4cb6c06 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/EnrichedEventPayload.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/ProcessedEventPayload.java @@ -9,13 +9,12 @@ import com.sitewhere.spi.device.event.IDeviceEvent; import com.sitewhere.spi.device.event.IDeviceEventContext; -import com.sitewhere.spi.device.event.kafka.IEnrichedEventPayload; +import com.sitewhere.spi.device.event.kafka.IProcessedEventPayload; /** - * Event payload that has been enriched with extra device/assignment data that - * may be useful in processing. + * Event payload after persistence. */ -public class EnrichedEventPayload implements IEnrichedEventPayload { +public class ProcessedEventPayload implements IProcessedEventPayload { /** Extra context */ private IDeviceEventContext eventContext; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventContext.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventContext.java index 987f31a..5495dad 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventContext.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventContext.java @@ -19,6 +19,27 @@ */ public interface IDeviceEventContext { + /** + * Get device token. + * + * @return + */ + String getDeviceToken(); + + /** + * Get originator. + * + * @return + */ + String getOriginator(); + + /** + * Get source id. + * + * @return + */ + String getSourceId(); + /** * Get the unique id of the device. * @@ -54,17 +75,45 @@ public interface IDeviceEventContext { */ Map getDeviceMetadata(); + /** + * Get the unique id of the device. + * + * @return + */ + UUID getDeviceAssignmentId(); + + /** + * Get customer id if assigned. + * + * @return + */ + UUID getCustomerId(); + + /** + * Get area id if assigned. + * + * @return + */ + UUID getAreaId(); + + /** + * Get asset id if assigned. + * + * @return + */ + UUID getAssetId(); + /** * Get the device assignment status. * * @return */ - DeviceAssignmentStatus getAssignmentStatus(); + DeviceAssignmentStatus getDeviceAssignmentStatus(); /** * Get a map of device assignment metadata. * * @return */ - Map getAssignmentMetadata(); + Map getDeviceAssignmentMetadata(); } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IPreprocessedEventPayload.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IPreprocessedEventPayload.java index 50acdb9..68a39dd 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IPreprocessedEventPayload.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IPreprocessedEventPayload.java @@ -7,25 +7,17 @@ */ package com.sitewhere.spi.device.event.kafka; -import java.util.UUID; +import com.sitewhere.spi.device.event.IDeviceEventContext; /** - * Event payload after payload is decoded and initial inbound processing has - * been completed. + * Event payload before persistence. */ public interface IPreprocessedEventPayload extends IDecodedEventPayload { /** - * Get unique device id. + * Get extra context information for event. * * @return */ - UUID getDeviceId(); - - /** - * Get unique device assignment id. - * - * @return - */ - UUID getDeviceAssignmentId(); + IDeviceEventContext getEventContext(); } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IEnrichedEventPayload.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IProcessedEventPayload.java similarity index 81% rename from sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IEnrichedEventPayload.java rename to sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IProcessedEventPayload.java index 07dcd80..7cd31da 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IEnrichedEventPayload.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IProcessedEventPayload.java @@ -11,10 +11,9 @@ import com.sitewhere.spi.device.event.IDeviceEventContext; /** - * Event payload that has been enriched with extra device/assignment data that - * may be useful in processing. + * Event payload after persistence. */ -public interface IEnrichedEventPayload { +public interface IProcessedEventPayload { /** * Get extra context information for event. From e231782d676db1acfeaa5354d2b0fa54d3d5851f Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Thu, 30 Jul 2020 18:26:47 -0400 Subject: [PATCH 37/48] feat: Support device assignment summaries. --- build.gradle | 2 +- .../model/device/DeviceAssignmentSummary.java | 112 ++++++++++++++++++ .../spi/device/IDeviceAssignmentSummary.java | 35 ++++++ 3 files changed, 148 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3024ca7..724e72b 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.beta8' + version = '3.0.0.beta9' repositories { maven { url "https://repo.maven.apache.org/maven2" } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignmentSummary.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignmentSummary.java index c1d6a17..73012e8 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignmentSummary.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignmentSummary.java @@ -23,6 +23,21 @@ public class DeviceAssignmentSummary extends PersistentEntity implements IDevice /** Serial version UID */ private static final long serialVersionUID = -6857027037347179506L; + /** Id of associated device */ + private UUID deviceId; + + /** Token of associated device */ + private String deviceToken; + + /** Type id of associated device */ + private UUID deviceTypeId; + + /** Device type name */ + private String deviceTypeName; + + /** Device type image url */ + private String deviceTypeImageUrl; + /** Id of assigned customer */ private UUID customerId; @@ -59,6 +74,70 @@ public class DeviceAssignmentSummary extends PersistentEntity implements IDevice /** Assignment end date */ private Date releasedDate; + /* + * @see com.sitewhere.spi.device.IDeviceAssignmentSummary#getDeviceId() + */ + @Override + public UUID getDeviceId() { + return deviceId; + } + + public void setDeviceId(UUID deviceId) { + this.deviceId = deviceId; + } + + /* + * @see com.sitewhere.spi.device.IDeviceAssignmentSummary#getDeviceToken() + */ + @Override + public String getDeviceToken() { + return deviceToken; + } + + public void setDeviceToken(String deviceToken) { + this.deviceToken = deviceToken; + } + + /* + * @see com.sitewhere.spi.device.IDeviceAssignmentSummary#getDeviceTypeId() + */ + @Override + public UUID getDeviceTypeId() { + return deviceTypeId; + } + + public void setDeviceTypeId(UUID deviceTypeId) { + this.deviceTypeId = deviceTypeId; + } + + /* + * @see com.sitewhere.spi.device.IDeviceAssignmentSummary#getDeviceTypeName() + */ + @Override + public String getDeviceTypeName() { + return deviceTypeName; + } + + public void setDeviceTypeName(String deviceTypeName) { + this.deviceTypeName = deviceTypeName; + } + + /* + * @see + * com.sitewhere.spi.device.IDeviceAssignmentSummary#getDeviceTypeImageUrl() + */ + @Override + public String getDeviceTypeImageUrl() { + return deviceTypeImageUrl; + } + + public void setDeviceTypeImageUrl(String deviceTypeImageUrl) { + this.deviceTypeImageUrl = deviceTypeImageUrl; + } + + /* + * @see com.sitewhere.spi.device.IDeviceAssignmentSummary#getCustomerId() + */ @Override public UUID getCustomerId() { return customerId; @@ -68,6 +147,9 @@ public void setCustomerId(UUID customerId) { this.customerId = customerId; } + /* + * @see com.sitewhere.spi.device.IDeviceAssignmentSummary#getCustomerName() + */ @Override public String getCustomerName() { return customerName; @@ -77,6 +159,9 @@ public void setCustomerName(String customerName) { this.customerName = customerName; } + /* + * @see com.sitewhere.spi.device.IDeviceAssignmentSummary#getCustomerImageUrl() + */ @Override public String getCustomerImageUrl() { return customerImageUrl; @@ -86,6 +171,9 @@ public void setCustomerImageUrl(String customerImageUrl) { this.customerImageUrl = customerImageUrl; } + /* + * @see com.sitewhere.spi.device.IDeviceAssignmentSummary#getAreaId() + */ @Override public UUID getAreaId() { return areaId; @@ -95,6 +183,9 @@ public void setAreaId(UUID areaId) { this.areaId = areaId; } + /* + * @see com.sitewhere.spi.device.IDeviceAssignmentSummary#getAreaName() + */ @Override public String getAreaName() { return areaName; @@ -104,6 +195,9 @@ public void setAreaName(String areaName) { this.areaName = areaName; } + /* + * @see com.sitewhere.spi.device.IDeviceAssignmentSummary#getAreaImageUrl() + */ @Override public String getAreaImageUrl() { return areaImageUrl; @@ -113,6 +207,9 @@ public void setAreaImageUrl(String areaImageUrl) { this.areaImageUrl = areaImageUrl; } + /* + * @see com.sitewhere.spi.device.IDeviceAssignmentSummary#getAssetId() + */ @Override public UUID getAssetId() { return assetId; @@ -122,6 +219,9 @@ public void setAssetId(UUID assetId) { this.assetId = assetId; } + /* + * @see com.sitewhere.spi.device.IDeviceAssignmentSummary#getAssetName() + */ @Override public String getAssetName() { return assetName; @@ -131,6 +231,9 @@ public void setAssetName(String assetName) { this.assetName = assetName; } + /* + * @see com.sitewhere.spi.device.IDeviceAssignmentSummary#getAssetImageUrl() + */ @Override public String getAssetImageUrl() { return assetImageUrl; @@ -140,6 +243,9 @@ public void setAssetImageUrl(String assetImageUrl) { this.assetImageUrl = assetImageUrl; } + /* + * @see com.sitewhere.spi.device.IDeviceAssignmentSummary#getStatus() + */ @Override public DeviceAssignmentStatus getStatus() { return status; @@ -149,6 +255,9 @@ public void setStatus(DeviceAssignmentStatus status) { this.status = status; } + /* + * @see com.sitewhere.spi.device.IDeviceAssignmentSummary#getActiveDate() + */ @Override public Date getActiveDate() { return activeDate; @@ -158,6 +267,9 @@ public void setActiveDate(Date activeDate) { this.activeDate = activeDate; } + /* + * @see com.sitewhere.spi.device.IDeviceAssignmentSummary#getReleasedDate() + */ @Override public Date getReleasedDate() { return releasedDate; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignmentSummary.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignmentSummary.java index e190041..55a87ff 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignmentSummary.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignmentSummary.java @@ -17,6 +17,41 @@ */ public interface IDeviceAssignmentSummary extends IPersistentEntity { + /** + * Get id for device associated with assignment. + * + * @return + */ + UUID getDeviceId(); + + /** + * Get token for device associated with assignment. + * + * @return + */ + String getDeviceToken(); + + /** + * Get id for device type associated with assignment. + * + * @return + */ + UUID getDeviceTypeId(); + + /** + * Get name for device type associated with assignment. + * + * @return + */ + String getDeviceTypeName(); + + /** + * Get image url for device type associated with assignment. + * + * @return + */ + String getDeviceTypeImageUrl(); + /** * Get unqiue id for customer assigned to device. * From 8a65f21366f186df148a0bb828fccf85eee3bdeb Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Thu, 6 Aug 2020 10:05:22 -0400 Subject: [PATCH 38/48] fix: Update area/customer type create request builders. --- build.gradle | 2 +- .../rest/model/area/request/AreaTypeCreateRequest.java | 6 ++++++ .../model/customer/request/CustomerTypeCreateRequest.java | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 724e72b..4233b5c 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.beta9' + version = '3.0.0.beta10' repositories { maven { url "https://repo.maven.apache.org/maven2" } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/AreaTypeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/AreaTypeCreateRequest.java index 5d7dff0..dbadaa4 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/AreaTypeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/AreaTypeCreateRequest.java @@ -12,6 +12,7 @@ import java.util.List; import com.sitewhere.rest.model.common.request.BrandedEntityCreateRequest; +import com.sitewhere.rest.model.customer.request.CustomerTypeCreateRequest.Builder; import com.sitewhere.spi.area.IAreaType; import com.sitewhere.spi.area.request.IAreaTypeCreateRequest; @@ -97,6 +98,11 @@ public Builder withDescription(String description) { return this; } + public Builder withImageUrl(String imageUrl) { + request.setImageUrl(imageUrl); + return this; + } + public Builder withIcon(String icon) { request.setIcon(icon); return this; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/request/CustomerTypeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/request/CustomerTypeCreateRequest.java index 6b2d45e..c634ccd 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/request/CustomerTypeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/request/CustomerTypeCreateRequest.java @@ -99,6 +99,11 @@ public Builder withDescription(String description) { return this; } + public Builder withImageUrl(String imageUrl) { + request.setImageUrl(imageUrl); + return this; + } + public Builder withIcon(String icon) { request.setIcon(icon); return this; From cd84e4e670b3e05a854ad57caf978f337c945642 Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Tue, 8 Sep 2020 17:10:33 -0400 Subject: [PATCH 39/48] chore: Upgrade Quarkus BOM to 1.7.2. --- build.gradle | 4 ++-- .../rest/model/area/request/AreaTypeCreateRequest.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 4233b5c..9e393c1 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.beta10' + version = '3.0.0.beta12' repositories { maven { url "https://repo.maven.apache.org/maven2" } @@ -40,7 +40,7 @@ subprojects { // Common dependencies used for all projects. dependencies { - compile platform('io.quarkus:quarkus-bom:1.2.1.Final') + compile platform('io.quarkus:quarkus-bom:1.7.2.Final') testCompile group: 'junit', name: 'junit' } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/AreaTypeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/AreaTypeCreateRequest.java index dbadaa4..c5a315f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/AreaTypeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/AreaTypeCreateRequest.java @@ -12,7 +12,6 @@ import java.util.List; import com.sitewhere.rest.model.common.request.BrandedEntityCreateRequest; -import com.sitewhere.rest.model.customer.request.CustomerTypeCreateRequest.Builder; import com.sitewhere.spi.area.IAreaType; import com.sitewhere.spi.area.request.IAreaTypeCreateRequest; From a69d4718a6c8fc5b28b5ece0d59e348886d52038 Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Mon, 14 Sep 2020 12:57:55 -0400 Subject: [PATCH 40/48] fix: Update to Apache 2 license. --- HEADER | 10 +- LICENSE.txt | 387 +++++++++--------- .../rest/client/AuthenticationRetrofit.java | 18 +- .../rest/client/SiteWhereClient.java | 18 +- .../rest/client/SiteWhereRestRetrofit.java | 18 +- .../rest/client/TenantAuthentication.java | 18 +- .../com/sitewhere/spi/ISiteWhereClient.java | 18 +- .../sitewhere/spi/ITenantAuthentication.java | 18 +- .../client/AbstractCRUDRestClientTests.java | 56 +-- .../rest/client/AbstractRestTest.java | 23 +- .../client/AbstractWithLabelCRUDRestTest.java | 25 +- .../rest/client/area/AreaRestTests.java | 113 ++--- .../rest/client/area/AreaTypeRestTests.java | 36 +- .../rest/client/asset/AssetRestTests.java | 18 +- .../rest/client/asset/AssetTypeRestTests.java | 18 +- .../client/batch/BatchOperationRestTests.java | 18 +- .../client/customer/CustomerRestTests.java | 105 ++--- .../customer/CustomerTypeRestTests.java | 22 +- .../device/DeviceAssignmentRestTests.java | 18 +- .../client/device/DeviceCommandRestTests.java | 50 ++- .../client/device/DeviceGroupRestTests.java | 19 +- .../rest/client/device/DeviceRestTests.java | 19 +- .../client/device/DeviceStateRestTests.java | 24 +- .../client/device/DeviceStatusRestTests.java | 41 +- .../client/device/DeviceTypeRestTests.java | 21 +- .../rest/client/device/ZoneRestTest.java | 19 +- .../client/scheduling/ScheduleRestTests.java | 37 +- .../scheduling/ScheduledJobRestTests.java | 32 +- .../client/user/AuthoritiesRestTests.java | 25 +- .../rest/client/user/UserRestTests.java | 19 +- .../java/com/sitewhere/test/StompTest.java | 18 +- .../com/sitewhere/rest/model/area/Area.java | 16 +- .../sitewhere/rest/model/area/AreaType.java | 18 +- .../com/sitewhere/rest/model/area/Zone.java | 18 +- .../model/area/request/AreaCreateRequest.java | 18 +- .../area/request/AreaTypeCreateRequest.java | 18 +- .../model/area/request/ZoneCreateRequest.java | 18 +- .../com/sitewhere/rest/model/asset/Asset.java | 18 +- .../sitewhere/rest/model/asset/AssetType.java | 18 +- .../asset/marshaling/MarshaledAsset.java | 18 +- .../asset/request/AssetCreateRequest.java | 18 +- .../asset/request/AssetTypeCreateRequest.java | 18 +- .../rest/model/batch/BatchElement.java | 18 +- .../rest/model/batch/BatchOperation.java | 18 +- .../model/batch/MarshaledBatchElement.java | 18 +- .../model/batch/MarshaledBatchOperation.java | 18 +- .../batch/kafka/UnprocessedBatchElement.java | 18 +- .../kafka/UnprocessedBatchOperation.java | 18 +- .../BatchCommandInvocationRequest.java | 18 +- .../request/BatchElementCreateRequest.java | 18 +- .../request/BatchOperationCreateRequest.java | 18 +- .../request/BatchOperationUpdateRequest.java | 18 +- ...InvocationByAssignmentCriteriaRequest.java | 18 +- .../InvocationByDeviceCriteriaRequest.java | 18 +- .../rest/model/command/CommandResponse.java | 18 +- .../rest/model/common/BrandedEntity.java | 18 +- .../sitewhere/rest/model/common/Location.java | 18 +- .../rest/model/common/MetadataProvider.java | 18 +- .../rest/model/common/PersistentEntity.java | 18 +- .../request/BrandedEntityCreateRequest.java | 18 +- .../PersistentEntityCreateRequest.java | 18 +- .../rest/model/customer/Customer.java | 18 +- .../rest/model/customer/CustomerType.java | 18 +- .../request/CustomerCreateRequest.java | 18 +- .../request/CustomerTypeCreateRequest.java | 18 +- .../sitewhere/rest/model/device/Device.java | 18 +- .../rest/model/device/DeviceAlarm.java | 18 +- .../rest/model/device/DeviceAssignment.java | 18 +- .../model/device/DeviceAssignmentSummary.java | 18 +- .../model/device/DeviceElementMapping.java | 18 +- .../rest/model/device/DeviceStatus.java | 18 +- .../rest/model/device/DeviceSummary.java | 18 +- .../rest/model/device/DeviceType.java | 18 +- .../device/asset/DeviceAlertWithAsset.java | 18 +- .../asset/DeviceCommandResponseWithAsset.java | 18 +- .../device/asset/DeviceEventWithAsset.java | 18 +- .../device/asset/DeviceLocationWithAsset.java | 18 +- .../asset/DeviceMeasurementWithAsset.java | 18 +- .../asset/DeviceStateChangeWithAsset.java | 18 +- .../model/device/charting/ChartEntry.java | 18 +- .../model/device/charting/ChartSeries.java | 18 +- .../device/command/CommandParameter.java | 18 +- .../model/device/command/DeviceCommand.java | 18 +- .../command/DeviceCommandExecution.java | 18 +- .../command/DeviceCommandNamespace.java | 18 +- .../command/DeviceMappingAckCommand.java | 18 +- .../command/DeviceStreamAckCommand.java | 18 +- .../command/RegistrationAckCommand.java | 18 +- .../command/RegistrationFailureCommand.java | 18 +- .../command/SendDeviceStreamDataCommand.java | 18 +- .../model/device/command/SystemCommand.java | 18 +- .../device/communication/DeviceRequest.java | 18 +- .../model/device/element/DeviceElement.java | 18 +- .../device/element/DeviceElementSchema.java | 18 +- .../rest/model/device/element/DeviceSlot.java | 18 +- .../rest/model/device/element/DeviceUnit.java | 18 +- .../rest/model/device/event/DeviceAlert.java | 18 +- .../device/event/DeviceCommandInvocation.java | 18 +- .../device/event/DeviceCommandResponse.java | 18 +- .../rest/model/device/event/DeviceEvent.java | 18 +- .../model/device/event/DeviceEventBatch.java | 18 +- .../event/DeviceEventBatchResponse.java | 18 +- .../device/event/DeviceEventContext.java | 18 +- .../device/event/DeviceEventOriginator.java | 18 +- .../model/device/event/DeviceLocation.java | 18 +- .../model/device/event/DeviceMeasurement.java | 18 +- .../model/device/event/DeviceStateChange.java | 18 +- .../event/kafka/DecodedEventPayload.java | 18 +- .../kafka/DeviceRegistrationPayload.java | 18 +- .../event/kafka/PreprocessedEventPayload.java | 18 +- .../event/kafka/ProcessedEventPayload.java | 18 +- .../request/DeviceAlertCreateRequest.java | 18 +- .../DeviceAssignmentEventCreateRequest.java | 18 +- .../DeviceCommandInvocationCreateRequest.java | 18 +- .../DeviceCommandResponseCreateRequest.java | 18 +- .../request/DeviceEventCreateRequest.java | 18 +- .../request/DeviceLocationCreateRequest.java | 18 +- .../DeviceMeasurementCreateRequest.java | 18 +- .../request/DeviceRegistrationRequest.java | 18 +- .../DeviceStateChangeCreateRequest.java | 18 +- .../request/SendDeviceStreamDataRequest.java | 18 +- .../event/scripting/DeviceEventSupport.java | 18 +- .../event/streaming/EventStreamAck.java | 18 +- .../view/DeviceCommandInvocationSummary.java | 18 +- .../rest/model/device/group/DeviceGroup.java | 18 +- .../device/group/DeviceGroupElement.java | 18 +- .../device/marshaling/MarshaledArea.java | 18 +- .../device/marshaling/MarshaledAreaType.java | 18 +- .../device/marshaling/MarshaledCustomer.java | 18 +- .../marshaling/MarshaledCustomerType.java | 18 +- .../device/marshaling/MarshaledDevice.java | 18 +- .../marshaling/MarshaledDeviceAssignment.java | 18 +- .../MarshaledDeviceCommandInvocation.java | 18 +- .../MarshaledDeviceGroupElement.java | 18 +- .../marshaling/MarshaledDeviceState.java | 18 +- .../request/DeviceAlarmCreateRequest.java | 18 +- .../request/DeviceAssignmentBulkRequest.java | 18 +- .../DeviceAssignmentCreateRequest.java | 18 +- .../request/DeviceCommandCreateRequest.java | 18 +- .../device/request/DeviceCreateRequest.java | 18 +- .../request/DeviceGroupCreateRequest.java | 18 +- .../DeviceGroupElementCreateRequest.java | 18 +- .../request/DeviceStatusCreateRequest.java | 40 +- .../request/DeviceStreamCreateRequest.java | 18 +- .../request/DeviceTypeCreateRequest.java | 18 +- .../rest/model/device/state/DeviceState.java | 18 +- .../model/device/state/RecentStateEvent.java | 18 +- .../request/DeviceStateCreateRequest.java | 18 +- .../request/DeviceStateEventMergeRequest.java | 18 +- .../RecentLocationEventCreateRequest.java | 18 +- .../RecentMeasurementEventCreateRequest.java | 18 +- .../RecentStateEventCreateRequest.java | 18 +- .../model/device/streaming/DeviceStream.java | 18 +- .../device/streaming/DeviceStreamData.java | 18 +- .../DeviceStreamDataCreateRequest.java | 18 +- .../support/DeviceAssignmentHistoryEntry.java | 18 +- .../InterpolatedAssignmentHistory.java | 18 +- .../com/sitewhere/rest/model/label/Label.java | 18 +- .../microservice/MicroserviceSummary.java | 18 +- .../rest/model/scheduling/Schedule.java | 18 +- .../rest/model/scheduling/ScheduledJob.java | 18 +- .../request/ScheduleCreateRequest.java | 18 +- .../request/ScheduledJobCreateRequest.java | 18 +- .../rest/model/search/AssetSearchResults.java | 18 +- .../model/search/DateRangeSearchCriteria.java | 18 +- .../search/DeviceAlertSearchResults.java | 18 +- .../search/DeviceAssignmentSearchResults.java | 18 +- .../DeviceCommandInvocationSearchResults.java | 18 +- .../search/DeviceCommandSearchResults.java | 18 +- .../DeviceGroupElementSearchResults.java | 18 +- .../search/DeviceGroupSearchResults.java | 18 +- .../search/DeviceLocationSearchResults.java | 18 +- .../DeviceMeasurementsSearchResults.java | 18 +- .../model/search/DeviceSearchResults.java | 18 +- .../search/DeviceStreamDataSearchResults.java | 18 +- .../search/DeviceStreamSearchResults.java | 18 +- .../model/search/DeviceTypeSearchResults.java | 18 +- .../sitewhere/rest/model/search/Pager.java | 18 +- .../rest/model/search/SearchCriteria.java | 18 +- .../rest/model/search/SearchResults.java | 18 +- .../sitewhere/rest/model/search/TreeNode.java | 18 +- .../rest/model/search/ZoneSearchResults.java | 18 +- .../model/search/area/AreaResponseFormat.java | 18 +- .../model/search/area/AreaSearchCriteria.java | 18 +- .../search/area/AreaTypeSearchCriteria.java | 18 +- .../search/asset/AssetSearchCriteria.java | 18 +- .../search/asset/AssetTypeSearchCriteria.java | 18 +- .../batch/BatchOperationSearchCriteria.java | 18 +- .../customer/CustomerResponseFormat.java | 18 +- .../customer/CustomerSearchCriteria.java | 18 +- .../customer/CustomerTypeResponseFormat.java | 18 +- .../customer/CustomerTypeSearchCriteria.java | 18 +- .../device/BatchElementSearchCriteria.java | 18 +- .../device/DeviceAlarmSearchCriteria.java | 18 +- .../DeviceAssignmentResponseFormat.java | 18 +- .../DeviceAssignmentSearchCriteria.java | 18 +- .../device/DeviceByGroupResponseFormat.java | 18 +- .../device/DeviceCommandSearchCriteria.java | 18 +- .../DeviceGroupElementResponseFormat.java | 18 +- .../DeviceGroupElementSearchCriteria.java | 18 +- .../device/DeviceGroupSearchCriteria.java | 18 +- .../search/device/DeviceResponseFormat.java | 18 +- .../search/device/DeviceSearchCriteria.java | 18 +- .../device/DeviceStateResponseFormat.java | 18 +- .../device/DeviceStateSearchCriteria.java | 18 +- .../device/DeviceStatusSearchCriteria.java | 18 +- .../device/DeviceTypeResponseFormat.java | 18 +- .../device/DeviceTypeSearchCriteria.java | 18 +- .../RecentStateEventSearchCriteria.java | 18 +- .../search/device/ZoneSearchCriteria.java | 18 +- .../scheduling/ScheduleResponseFormat.java | 18 +- .../scheduling/ScheduleSearchCriteria.java | 18 +- .../ScheduledJobResponseFormat.java | 18 +- .../ScheduledJobSearchCriteria.java | 18 +- .../search/tenant/TenantSearchCriteria.java | 18 +- .../search/tenant/TenantSearchResults.java | 18 +- .../model/search/user/UserSearchCriteria.java | 18 +- .../model/search/user/UserSearchResults.java | 18 +- .../sitewhere/rest/model/system/Version.java | 18 +- .../sitewhere/rest/model/tenant/Tenant.java | 18 +- .../tenant/request/TenantCreateRequest.java | 18 +- .../rest/model/user/GrantedAuthority.java | 18 +- .../GrantedAuthorityHierarchyBuilder.java | 18 +- .../user/GrantedAuthorityHierarchyNode.java | 18 +- .../user/GrantedAuthoritySearchCriteria.java | 18 +- .../com/sitewhere/rest/model/user/Role.java | 22 +- .../rest/model/user/RoleSearchCriteria.java | 18 +- .../com/sitewhere/rest/model/user/User.java | 18 +- .../GrantedAuthorityCreateRequest.java | 18 +- .../model/user/request/RoleCreateRequest.java | 44 +- .../model/user/request/UserCreateRequest.java | 18 +- .../com/sitewhere/spi/SiteWhereException.java | 18 +- .../spi/SiteWhereSystemException.java | 18 +- .../java/com/sitewhere/spi/area/IArea.java | 18 +- .../com/sitewhere/spi/area/IAreaType.java | 18 +- .../sitewhere/spi/area/IBoundedEntity.java | 18 +- .../java/com/sitewhere/spi/area/IZone.java | 18 +- .../spi/area/request/IAreaCreateRequest.java | 18 +- .../area/request/IAreaTypeCreateRequest.java | 18 +- .../spi/area/request/IZoneCreateRequest.java | 18 +- .../sitewhere/spi/asset/AssetCategory.java | 18 +- .../java/com/sitewhere/spi/asset/IAsset.java | 18 +- .../com/sitewhere/spi/asset/IAssetType.java | 18 +- .../asset/request/IAssetCreateRequest.java | 18 +- .../request/IAssetTypeCreateRequest.java | 18 +- .../spi/batch/BatchOperationStatus.java | 18 +- .../spi/batch/ElementProcessingStatus.java | 18 +- .../sitewhere/spi/batch/IBatchElement.java | 18 +- .../sitewhere/spi/batch/IBatchOperation.java | 18 +- .../batch/kafka/IUnprocessedBatchElement.java | 18 +- .../kafka/IUnprocessedBatchOperation.java | 18 +- .../IBatchCommandInvocationRequest.java | 18 +- .../request/IBatchElementCreateRequest.java | 18 +- .../request/IBatchOperationCreateRequest.java | 18 +- .../request/IBatchOperationUpdateRequest.java | 18 +- ...InvocationByAssignmentCriteriaRequest.java | 18 +- .../IInvocationByDeviceCriteriaRequest.java | 18 +- .../sitewhere/spi/command/CommandResult.java | 18 +- .../spi/command/ICommandResponse.java | 18 +- .../com/sitewhere/spi/common/Comparators.java | 18 +- .../com/sitewhere/spi/common/IAccessible.java | 18 +- .../sitewhere/spi/common/IBrandedEntity.java | 18 +- .../spi/common/IBrandedTreeEntity.java | 18 +- .../sitewhere/spi/common/IColorProvider.java | 18 +- .../com/sitewhere/spi/common/IFilter.java | 18 +- .../sitewhere/spi/common/IIconProvider.java | 18 +- .../sitewhere/spi/common/IImageProvider.java | 18 +- .../com/sitewhere/spi/common/ILocation.java | 18 +- .../spi/common/IMetadataProvider.java | 18 +- .../spi/common/IPersistentEntity.java | 18 +- .../com/sitewhere/spi/common/ITreeEntity.java | 18 +- .../request/IBrandedEntityCreateRequest.java | 18 +- .../IPersistentEntityCreateRequest.java | 18 +- .../request/ITreeEntityCreateRequest.java | 18 +- .../com/sitewhere/spi/customer/ICustomer.java | 18 +- .../sitewhere/spi/customer/ICustomerType.java | 18 +- .../request/ICustomerCreateRequest.java | 18 +- .../request/ICustomerTypeCreateRequest.java | 18 +- .../spi/device/DeviceAlarmState.java | 18 +- .../spi/device/DeviceAssignmentStatus.java | 18 +- .../spi/device/DeviceContainerPolicy.java | 18 +- .../com/sitewhere/spi/device/IDevice.java | 18 +- .../sitewhere/spi/device/IDeviceActions.java | 18 +- .../sitewhere/spi/device/IDeviceAlarm.java | 18 +- .../spi/device/IDeviceAssignment.java | 18 +- .../spi/device/IDeviceAssignmentSummary.java | 18 +- .../spi/device/IDeviceElementMapping.java | 18 +- .../spi/device/IDeviceNestingContext.java | 18 +- .../sitewhere/spi/device/IDeviceStatus.java | 18 +- .../sitewhere/spi/device/IDeviceSummary.java | 18 +- .../com/sitewhere/spi/device/IDeviceType.java | 18 +- .../device/asset/IDeviceEventWithAsset.java | 18 +- .../spi/device/charting/IChartEntry.java | 18 +- .../spi/device/charting/IChartSeries.java | 18 +- .../device/command/DeviceMappingResult.java | 18 +- .../device/command/DeviceStreamStatus.java | 18 +- .../spi/device/command/ICommandParameter.java | 18 +- .../spi/device/command/IDeviceCommand.java | 18 +- .../command/IDeviceCommandExecution.java | 18 +- .../command/IDeviceCommandNamespace.java | 18 +- .../command/IDeviceMappingAckCommand.java | 18 +- .../command/IDeviceStreamAckCommand.java | 18 +- .../command/IRegistrationAckCommand.java | 18 +- .../command/IRegistrationFailureCommand.java | 18 +- .../command/ISendDeviceStreamDataCommand.java | 18 +- .../spi/device/command/ISystemCommand.java | 18 +- .../spi/device/command/ParameterType.java | 18 +- .../command/RegistrationFailureReason.java | 18 +- .../command/RegistrationSuccessReason.java | 18 +- .../spi/device/command/SystemCommandType.java | 18 +- .../spi/device/element/IDeviceElement.java | 18 +- .../device/element/IDeviceElementSchema.java | 18 +- .../spi/device/element/IDeviceSlot.java | 18 +- .../spi/device/element/IDeviceUnit.java | 18 +- .../spi/device/event/AlertLevel.java | 18 +- .../spi/device/event/AlertSource.java | 18 +- .../spi/device/event/CommandInitiator.java | 18 +- .../spi/device/event/CommandStatus.java | 18 +- .../spi/device/event/CommandTarget.java | 18 +- .../spi/device/event/DeviceEventIndex.java | 18 +- .../spi/device/event/DeviceEventType.java | 18 +- .../spi/device/event/IDeviceAlert.java | 18 +- .../spi/device/event/IDeviceAlertContent.java | 18 +- .../event/IDeviceCommandInvocation.java | 18 +- .../device/event/IDeviceCommandResponse.java | 18 +- .../spi/device/event/IDeviceEvent.java | 18 +- .../spi/device/event/IDeviceEventBatch.java | 18 +- .../event/IDeviceEventBatchResponse.java | 18 +- .../spi/device/event/IDeviceEventContext.java | 18 +- .../device/event/IDeviceEventOriginator.java | 18 +- .../spi/device/event/IDeviceLocation.java | 18 +- .../device/event/IDeviceLocationContent.java | 18 +- .../spi/device/event/IDeviceMeasurement.java | 18 +- .../event/IDeviceMeasurementClassifier.java | 18 +- .../event/IDeviceMeasurementContent.java | 18 +- .../spi/device/event/IDeviceStateChange.java | 18 +- .../event/kafka/IDecodedEventPayload.java | 18 +- .../kafka/IDeviceRegistrationPayload.java | 18 +- .../kafka/IPreprocessedEventPayload.java | 18 +- .../event/kafka/IProcessedEventPayload.java | 18 +- .../request/IDeviceAlertCreateRequest.java | 18 +- .../IDeviceAssignmentEventCreateRequest.java | 18 +- ...IDeviceCommandInvocationCreateRequest.java | 18 +- .../IDeviceCommandResponseCreateRequest.java | 18 +- .../request/IDeviceEventCreateRequest.java | 18 +- .../request/IDeviceLocationCreateRequest.java | 18 +- .../IDeviceMeasurementCreateRequest.java | 18 +- .../request/IDeviceRegistrationRequest.java | 18 +- .../IDeviceStateChangeCreateRequest.java | 18 +- .../request/IDeviceStreamCreateRequest.java | 18 +- .../request/ISendDeviceStreamDataRequest.java | 18 +- .../spi/device/event/state/PresenceState.java | 18 +- .../device/event/state/RegistrationState.java | 18 +- .../event/streaming/IEventStreamAck.java | 18 +- .../spi/device/group/IDeviceGroup.java | 18 +- .../spi/device/group/IDeviceGroupElement.java | 18 +- .../request/IDeviceAlarmCreateRequest.java | 18 +- .../request/IDeviceAssignmentBulkRequest.java | 18 +- .../IDeviceAssignmentCreateRequest.java | 18 +- .../request/IDeviceCommandCreateRequest.java | 18 +- .../device/request/IDeviceCreateRequest.java | 18 +- .../request/IDeviceGroupCreateRequest.java | 18 +- .../IDeviceGroupElementCreateRequest.java | 18 +- .../request/IDeviceStatusCreateRequest.java | 18 +- .../request/IDeviceTypeCreateRequest.java | 18 +- .../spi/device/state/IDeviceState.java | 18 +- .../spi/device/state/IRecentAlertEvent.java | 18 +- .../device/state/IRecentLocationEvent.java | 18 +- .../device/state/IRecentMeasurementEvent.java | 18 +- .../spi/device/state/IRecentStateEvent.java | 18 +- .../request/IDeviceStateCreateRequest.java | 18 +- .../IDeviceStateEventMergeRequest.java | 18 +- .../IRecentLocationEventCreateRequest.java | 18 +- .../IRecentMeasurementEventCreateRequest.java | 18 +- .../IRecentStateEventCreateRequest.java | 18 +- .../spi/device/streaming/IDeviceStream.java | 18 +- .../device/streaming/IDeviceStreamData.java | 18 +- .../IDeviceStreamDataCreateRequest.java | 18 +- .../spi/device/util/DeviceTypeUtils.java | 18 +- .../spi/device/util/DeviceUtils.java | 18 +- .../com/sitewhere/spi/error/ErrorCode.java | 18 +- .../com/sitewhere/spi/error/ErrorLevel.java | 18 +- .../spi/error/ResourceExistsException.java | 18 +- .../spi/geospatial/IZoneMatcher.java | 18 +- .../spi/geospatial/IZoneRelationship.java | 18 +- .../spi/geospatial/ZoneContainment.java | 18 +- .../java/com/sitewhere/spi/label/ILabel.java | 18 +- .../microservice/IMicroserviceSummary.java | 18 +- .../sitewhere/spi/scheduling/ISchedule.java | 18 +- .../spi/scheduling/IScheduledJob.java | 18 +- .../spi/scheduling/JobConstants.java | 18 +- .../spi/scheduling/ScheduledJobState.java | 18 +- .../spi/scheduling/ScheduledJobType.java | 18 +- .../spi/scheduling/TriggerConstants.java | 18 +- .../sitewhere/spi/scheduling/TriggerType.java | 18 +- .../request/IScheduleCreateRequest.java | 18 +- .../request/IScheduledJobCreateRequest.java | 18 +- .../spi/search/IDateRangeSearchCriteria.java | 18 +- .../sitewhere/spi/search/ISearchCriteria.java | 18 +- .../sitewhere/spi/search/ISearchResults.java | 18 +- .../com/sitewhere/spi/search/ITreeNode.java | 18 +- .../spi/search/area/IAreaResponseFormat.java | 18 +- .../spi/search/area/IAreaSearchCriteria.java | 18 +- .../search/area/IAreaTypeSearchCriteria.java | 18 +- .../search/asset/IAssetSearchCriteria.java | 18 +- .../asset/IAssetTypeSearchCritiera.java | 18 +- .../batch/IBatchOperationSearchCriteria.java | 18 +- .../customer/ICustomerResponseFormat.java | 18 +- .../customer/ICustomerSearchCriteria.java | 18 +- .../customer/ICustomerTypeResponseFormat.java | 18 +- .../customer/ICustomerTypeSearchCriteria.java | 18 +- .../device/IBatchElementSearchCriteria.java | 18 +- .../device/IDeviceAlarmSearchCriteria.java | 18 +- .../IDeviceAssignmentResponseFormat.java | 18 +- .../IDeviceAssignmentSearchCriteria.java | 18 +- .../device/IDeviceByGroupResponseFormat.java | 18 +- .../device/IDeviceCommandSearchCriteria.java | 18 +- .../IDeviceGroupElementResponseFormat.java | 18 +- .../IDeviceGroupElementSearchCriteria.java | 18 +- .../device/IDeviceGroupSearchCriteria.java | 18 +- .../search/device/IDeviceResponseFormat.java | 18 +- .../search/device/IDeviceSearchCriteria.java | 18 +- .../device/IDeviceStateResponseFormat.java | 18 +- .../device/IDeviceStateSearchCriteria.java | 18 +- .../device/IDeviceStatusSearchCriteria.java | 18 +- .../device/IDeviceTypeResponseFormat.java | 18 +- .../device/IDeviceTypeSearchCriteria.java | 18 +- .../IRecentStateEventSearchCriteria.java | 18 +- .../search/device/IZoneSearchCriteria.java | 18 +- .../scheduling/IScheduleResponseFormat.java | 18 +- .../scheduling/IScheduleSearchCriteria.java | 18 +- .../IScheduledJobResponseFormat.java | 18 +- .../IScheduledJobSearchCriteria.java | 18 +- .../search/tenant/ITenantSearchCriteria.java | 18 +- .../com/sitewhere/spi/system/IVersion.java | 18 +- .../com/sitewhere/spi/tenant/ITenant.java | 18 +- .../tenant/TenantNotAvailableException.java | 18 +- .../tenant/request/ITenantCreateRequest.java | 18 +- .../com/sitewhere/spi/user/AccountStatus.java | 16 +- .../sitewhere/spi/user/IGrantedAuthority.java | 18 +- .../user/IGrantedAuthoritySearchCriteria.java | 18 +- .../java/com/sitewhere/spi/user/IRole.java | 18 +- .../spi/user/IRoleSearchCriteria.java | 18 +- .../java/com/sitewhere/spi/user/IUser.java | 18 +- .../spi/user/IUserSearchCriteria.java | 18 +- .../spi/user/SiteWhereAuthority.java | 18 +- .../com/sitewhere/spi/user/SiteWhereRole.java | 67 +-- .../sitewhere/spi/user/SiteWhereRoles.java | 18 +- .../IGrantedAuthorityCreateRequest.java | 18 +- .../spi/user/request/IRoleCreateRequest.java | 18 +- .../spi/user/request/IUserCreateRequest.java | 18 +- .../spi/web/ISiteWhereWebConstants.java | 18 +- 452 files changed, 6278 insertions(+), 2678 deletions(-) diff --git a/HEADER b/HEADER index 63ecc37..4c73186 100644 --- a/HEADER +++ b/HEADER @@ -1,7 +1,3 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com - * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. - */ \ No newline at end of file +/** + */ + \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index 960ea5d..9b5e401 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,187 +1,202 @@ -Common Public Attribution License Version 1.0 (CPAL-1.0) -1. “Definitions” - - 1.0.1 “Commercial Use” means distribution or otherwise making the Covered Code available to a third party. - - 1.1 “Contributor” means each entity that creates or contributes to the creation of Modifications. - - 1.2 “Contributor Version” means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. - - 1.3 “Covered Code” means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof. - - 1.4 “Electronic Distribution Mechanism” means a mechanism generally accepted in the software development community for the electronic transfer of data. - - 1.5 “Executable” means Covered Code in any form other than Source Code. - - 1.6 “Initial Developer” means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A. - - 1.7 “Larger Work” means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. - - 1.8 “License” means this document. - - 1.8.1 “Licensable” means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. - - 1.9 “Modifications” means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: - - A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. - - B. Any new file that contains any part of the Original Code or previous Modifications. - - 1.10 “Original Code” means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. - - 1.10.1 “Patent Claims” means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor. - - 1.11 “Source Code” means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor’s choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. - - 1.12 “You” (or “Your”) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, “You” includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, “control” means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. - -2. Source Code License. - - 2.1 The Initial Developer Grant. - The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: - - (a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and - - (b) under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof). - - (c) the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License. - - (d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code; or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices. - - 2.2 Contributor Grant. - Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license - - (a) under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and - - (b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination). - - (c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code. - - (d) Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2) separate from the Contributor Version; 3) for infringements caused by: i) third party modifications of Contributor Version or ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor. - -3. Distribution Obligations. - - 3.1 Application of License. - The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients’ rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5. - - 3.2 Availability of Source Code. - Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party. - - 3.3 Description of Modifications. - You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code. - - 3.4 Intellectual Property Matters - - (a) Third Party Claims. - If Contributor has knowledge that a license under a third party’s intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled “LEGAL” which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained. - - (b) Contributor APIs. - If Contributor’s Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file. - - (c) Representations. - Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor’s Modifications are Contributor’s original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License. - - 3.5 Required Notices. - You must duplicate the notice in Exhibit A in each file of the Source Code. If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice. If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A. You must also duplicate this License in any documentation for the Source Code where You describe recipients’ rights or ownership rights relating to Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. - - 3.6 Distribution of Executable Versions. - You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients’ rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient’s rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer, Original Developer or any Contributor. You hereby agree to indemnify the Initial Developer, Original Developer and every Contributor for any liability incurred by the Initial Developer, Original Developer or such Contributor as a result of any such terms You offer. - - 3.7 Larger Works. - You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code. - -4. Inability to Comply Due to Statute or Regulation. - - If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. - -5. Application of this License. - - This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code. - -6. Versions of the License. - - 6.1 New Versions. - Socialtext, Inc. (“Socialtext”) may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number. - - 6.2 Effect of New Versions. - Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Socialtext. No one other than Socialtext has the right to modify the terms applicable to Covered Code created under this License. - - 6.3 Derivative Works. - If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases “Socialtext”, “CPAL” or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the CPAL. (Filling in the name of the Initial Developer, Original Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.) - -7. DISCLAIMER OF WARRANTY. - - COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN “AS IS” BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER, ORIGINAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -8. TERMINATION. - - 8.1 This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. - - 8.2 If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer, Original Developer or a Contributor (the Initial Developer, Original Developer or Contributor against whom You file such action is referred to as “Participant”) alleging that: - - (a) such Participant’s Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i) agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant. If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above. - - (b) any software, hardware, or device, other than such Participant’s Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant. - - 8.3 If You assert a patent infringement claim against Participant alleging that such Participant’s Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. - - 8.4 In the event of termination under Sections 8.1 or 8.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination. - -9. LIMITATION OF LIABILITY. - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ORIGINAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY’S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. - - The Covered Code is a “commercial item,” as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of “commercial computer software” and “commercial computer software documentation,” as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. - -11. MISCELLANEOUS. - - This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys’ fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. - -12. RESPONSIBILITY FOR CLAIMS. - - As between Initial Developer, Original Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer, Original Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. - -13. MULTIPLE-LICENSED CODE. - - Initial Developer may designate portions of the Covered Code as Multiple-Licensed. Multiple-Licensed means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the CPAL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A. - -14. ADDITIONAL TERM: ATTRIBUTION - - (a) As a modest attribution to the organizer of the development of the Original Code (“Original Developer”), in the hope that its promotional value may help justify the time, money and effort invested in writing the Original Code, the Original Developer may include in Exhibit B (“Attribution Information”) a requirement that each time an Executable and Source Code or a Larger Work is launched or initially run (which includes initiating a session), a prominent display of the Original Developer’s Attribution Information (as defined below) must occur on the graphic user interface employed by the end user to access such Covered Code (which may include display on a splash screen), if any. The size of the graphic image should be consistent with the size of the other elements of the Attribution Information. If the access by the end user to the Executable and Source Code does not create a graphic user interface for access to the Covered Code, this obligation shall not apply. If the Original Code displays such Attribution Information in a particular form (such as in the form of a splash screen, notice at login, an “about” display, or dedicated attribution area on user interface screens), continued use of such form for that Attribution Information is one way of meeting this requirement for notice. - - (b) Attribution information may only include a copyright notice, a brief phrase, graphic image and a URL (“Attribution Information”) and is subject to the Attribution Limits as defined below. For these purposes, prominent shall mean display for sufficient duration to give reasonable notice to the user of the identity of the Original Developer and that if You include Attribution Information or similar information for other parties, You must ensure that the Attribution Information for the Original Developer shall be no less prominent than such Attribution Information or similar information for the other party. For greater certainty, the Original Developer may choose to specify in Exhibit B below that the above attribution requirement only applies to an Executable and Source Code resulting from the Original Code or any Modification, but not a Larger Work. The intent is to provide for reasonably modest attribution, therefore the Original Developer cannot require that You display, at any time, more than the following information as Attribution Information: (a) a copyright notice including the name of the Original Developer; (b) a word or one phrase (not exceeding 10 words); (c) one graphic image provided by the Original Developer; and (d) a URL (collectively, the “Attribution Limits”). - - (c) If Exhibit B does not include any Attribution Information, then there are no requirements for You to display any Attribution Information of the Original Developer. - - (d) You acknowledge that all trademarks, service marks and/or trade names contained within the Attribution Information distributed with the Covered Code are the exclusive property of their owners and may only be used with the permission of their owners, or under circumstances otherwise permitted by law or as expressly set out in this License. - -15. ADDITIONAL TERM: NETWORK USE. - - The term “External Deployment” means the use, distribution, or communication of the Original Code or Modifications in any way such that the Original Code or Modifications may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Code or Modifications as a distribution under section 3.1 and make Source Code available under Section 3.2. - -EXHIBIT A. Common Public Attribution License Version 1.0. - - “The contents of this file are subject to the Common Public Attribution License Version 1.0 (the “License”); you may not use this file except in compliance with the License. You may obtain a copy of the License at _____________. The License is based on the Mozilla Public License Version 1.1 but Sections 14 and 15 have been added to cover use of software over a computer network and provide for limited attribution for the Original Developer. In addition, Exhibit A has been modified to be consistent with Exhibit B. - - Software distributed under the License is distributed on an “AS IS” basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. - - The Original Code is SiteWhere. - - The Initial Developer of the Original Code is SiteWhere LLC. All portions of the code are Copyright (c) 2009-2014 SiteWhere LLC. All Rights Reserved. - - [NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] - -EXHIBIT B. Attribution Information - - Attribution Copyright Notice: Copyright (c) SiteWhere, LLC. - - Attribution Phrase (not exceeding 10 words): Powered by SiteWhere - - Attribution URL: http://www.sitewhere.com - - Graphic Image as provided in the Covered Code, if any. - - Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL. \ No newline at end of file + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. \ No newline at end of file diff --git a/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/AuthenticationRetrofit.java b/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/AuthenticationRetrofit.java index ff0191a..d131502 100644 --- a/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/AuthenticationRetrofit.java +++ b/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/AuthenticationRetrofit.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client; diff --git a/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereClient.java b/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereClient.java index 1724a1f..fd14ddc 100644 --- a/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereClient.java +++ b/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereClient.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client; diff --git a/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereRestRetrofit.java b/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereRestRetrofit.java index 1781a81..df252d7 100644 --- a/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereRestRetrofit.java +++ b/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereRestRetrofit.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client; diff --git a/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/TenantAuthentication.java b/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/TenantAuthentication.java index fe7bf85..22dc102 100644 --- a/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/TenantAuthentication.java +++ b/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/TenantAuthentication.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client; diff --git a/sitewhere-java-client/src/main/java/com/sitewhere/spi/ISiteWhereClient.java b/sitewhere-java-client/src/main/java/com/sitewhere/spi/ISiteWhereClient.java index bd595b9..7d68dff 100644 --- a/sitewhere-java-client/src/main/java/com/sitewhere/spi/ISiteWhereClient.java +++ b/sitewhere-java-client/src/main/java/com/sitewhere/spi/ISiteWhereClient.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi; diff --git a/sitewhere-java-client/src/main/java/com/sitewhere/spi/ITenantAuthentication.java b/sitewhere-java-client/src/main/java/com/sitewhere/spi/ITenantAuthentication.java index 0a74f80..3111489 100644 --- a/sitewhere-java-client/src/main/java/com/sitewhere/spi/ITenantAuthentication.java +++ b/sitewhere-java-client/src/main/java/com/sitewhere/spi/ITenantAuthentication.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi; diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/AbstractCRUDRestClientTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/AbstractCRUDRestClientTests.java index f3151a6..d59b713 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/AbstractCRUDRestClientTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/AbstractCRUDRestClientTests.java @@ -1,9 +1,17 @@ /* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * Copyright © 2014-2020 The SiteWhere Authors * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client; @@ -24,59 +32,57 @@ * * @author Jorge Villaverde */ -public abstract class AbstractCRUDRestClientTests +public abstract class AbstractCRUDRestClientTests extends AbstractRestTest { - + /** Entity token */ private String token = UUID.randomUUID().toString(); - + /** Entity */ private T entity; // Tests ------------------------------------------------------------------ - + @Test public void testCRUDEntity() throws SiteWhereException { CR createRequest = buildCreateRequest(token); - + this.entity = createEntity(createRequest); - + assertNotNull("Entity is null", entity); T foundEntity = findEntityByToken(getToken()); - - assertEquals("Entity are not equals", - this.entity.getToken(), - foundEntity.getToken()); - + + assertEquals("Entity are not equals", this.entity.getToken(), foundEntity.getToken()); + CR updateRequest = buildUpdateRequest(getToken()); - + T updatedEntity = updateEntity(getToken(), updateRequest); - + assertNotNull("Updated entity is null", updatedEntity); - + T deleteEntity = deleteEntity(getToken()); assertNotNull("Deleted entity is null", deleteEntity); } - + @Test public void testList() throws SiteWhereException { SearchResults results = listEntities(); assertNotNull(results); assertTrue(results.getNumResults() >= 0); } - + protected String getToken() { return this.token; } - + // Abstract Methods ------------------------------------------------------- - + protected abstract String knownEntityToken(); - + protected abstract CR buildCreateRequest(String token) throws SiteWhereException; - + protected abstract T createEntity(CR createRequest) throws SiteWhereException; protected abstract T findEntityByToken(String token) throws SiteWhereException; @@ -88,5 +94,5 @@ protected String getToken() { protected abstract T deleteEntity(String token) throws SiteWhereException; protected abstract SearchResults listEntities() throws SiteWhereException; - + } diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/AbstractRestTest.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/AbstractRestTest.java index 358dbf6..beac41e 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/AbstractRestTest.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/AbstractRestTest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client; @@ -15,6 +23,7 @@ /** * Base Tenant Test class. + * * @author Jorge Villaverde */ public abstract class AbstractRestTest { @@ -32,11 +41,11 @@ public void init() throws SiteWhereException { } // Getters/Setters -------------------------------------------------------- - + protected ISiteWhereClient getClient() { return client; } - + protected ITenantAuthentication getTenatAuthentication() { return tenantAuthentication; } diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/AbstractWithLabelCRUDRestTest.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/AbstractWithLabelCRUDRestTest.java index 2b86e67..68c0e07 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/AbstractWithLabelCRUDRestTest.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/AbstractWithLabelCRUDRestTest.java @@ -1,10 +1,17 @@ - -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client; @@ -21,11 +28,11 @@ * @author Jorge Villaverde * */ -public abstract class AbstractWithLabelCRUDRestTest +public abstract class AbstractWithLabelCRUDRestTest extends AbstractCRUDRestClientTests { - + protected static final String QR_GENERATIO_ID = "qrcode"; - + @Test public void testLabel() throws SiteWhereException { byte[] label = getLabelForEntity(knownEntityToken(), QR_GENERATIO_ID); diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/area/AreaRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/area/AreaRestTests.java index 5a3f618..5801a41 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/area/AreaRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/area/AreaRestTests.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client.area; @@ -47,22 +55,22 @@ public class AreaRestTests extends AbstractWithLabelCRUDRestTest listEntities() throws SiteWhereException { AreaSearchCriteria searchCriteria = new AreaSearchCriteria(0, 10); @@ -121,30 +129,30 @@ protected SearchResults listEntities() throws SiteWhereException { // ------------------------------------------------------------------------ // LABEL // ------------------------------------------------------------------------ - + @Override protected byte[] getLabelForEntity(String token, String generatorId) throws SiteWhereException { return getClient().getLabelForArea(getTenatAuthentication(), token, generatorId); } - + // ------------------------------------------------------------------------ // OTHER TESTS // ------------------------------------------------------------------------ - + @Test public void testListAlerts() throws SiteWhereException { Calendar cal = Calendar.getInstance(); - + cal.setTime(new Date()); cal.add(Calendar.YEAR, -1); - + Date startDate = cal.getTime(); Date endDate = new Date(); - + DateRangeSearchCriteria searchCriteria = new DateRangeSearchCriteria(1, 10, startDate, endDate); - SearchResults alerts = getClient() - .listAlertsForArea(getTenatAuthentication(), parentToken, searchCriteria); - + SearchResults alerts = getClient().listAlertsForArea(getTenatAuthentication(), + parentToken, searchCriteria); + assertNotNull(alerts); } @@ -153,100 +161,99 @@ public void testListAssignments() throws SiteWhereException { DeviceAssignmentSearchCriteria searchCriteria = new DeviceAssignmentSearchCriteria(); DeviceAssignmentResponseFormat responseFormat = new DeviceAssignmentResponseFormat(); responseFormat.setIncludeCustomer(true); - SearchResults assignments = - getClient().listDeviceAssignmentsForArea( - getTenatAuthentication(), parentToken, searchCriteria, responseFormat); + SearchResults assignments = getClient() + .listDeviceAssignmentsForArea(getTenatAuthentication(), parentToken, searchCriteria, responseFormat); assertNotNull(assignments); } - + @Test public void testListCommandInvocations() throws SiteWhereException { Calendar cal = Calendar.getInstance(); - + cal.setTime(new Date()); cal.add(Calendar.YEAR, -1); - + Date startDate = cal.getTime(); Date endDate = new Date(); - + DateRangeSearchCriteria searchCriteria = new DateRangeSearchCriteria(1, 10, startDate, endDate); SearchResults commandInvocations = getClient() .listCommandInvocationsForArea(getTenatAuthentication(), parentToken, searchCriteria); - + assertNotNull(commandInvocations); } @Test public void testListLocations() throws SiteWhereException { Calendar cal = Calendar.getInstance(); - + cal.setTime(new Date()); cal.add(Calendar.YEAR, -1); - + Date startDate = cal.getTime(); Date endDate = new Date(); - + DateRangeSearchCriteria searchCriteria = new DateRangeSearchCriteria(1, 10, startDate, endDate); - SearchResults locations = getClient() - .listLocationsForArea(getTenatAuthentication(), parentToken, searchCriteria); - + SearchResults locations = getClient().listLocationsForArea(getTenatAuthentication(), + parentToken, searchCriteria); + assertNotNull(locations); - } + } @Test public void testListMeasurements() throws SiteWhereException { Calendar cal = Calendar.getInstance(); - + cal.setTime(new Date()); cal.add(Calendar.YEAR, -1); - + Date startDate = cal.getTime(); Date endDate = new Date(); - + DateRangeSearchCriteria searchCriteria = new DateRangeSearchCriteria(1, 10, startDate, endDate); SearchResults measurements = getClient() .listMeasurementsForArea(getTenatAuthentication(), parentToken, searchCriteria); - + assertNotNull(measurements); - } + } @Test public void testListCommandResponses() throws SiteWhereException { Calendar cal = Calendar.getInstance(); - + cal.setTime(new Date()); cal.add(Calendar.YEAR, -1); - + Date startDate = cal.getTime(); Date endDate = new Date(); - + DateRangeSearchCriteria searchCriteria = new DateRangeSearchCriteria(1, 10, startDate, endDate); SearchResults commandResponses = getClient() .listCommandResponsesForArea(getTenatAuthentication(), parentToken, searchCriteria); - + assertNotNull(commandResponses); - } + } @Test public void testListStateChanges() throws SiteWhereException { Calendar cal = Calendar.getInstance(); - + cal.setTime(new Date()); cal.add(Calendar.YEAR, -1); - + Date startDate = cal.getTime(); Date endDate = new Date(); - + DateRangeSearchCriteria searchCriteria = new DateRangeSearchCriteria(1, 10, startDate, endDate); SearchResults stateChanges = getClient() .listStateChangesForArea(getTenatAuthentication(), parentToken, searchCriteria); - + assertNotNull(stateChanges); - } + } @Test public void testTree() throws SiteWhereException { List tree = getClient().areaTree(getTenatAuthentication()); assertNotNull(tree); - } + } } diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/area/AreaTypeRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/area/AreaTypeRestTests.java index 8222951..1aa7862 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/area/AreaTypeRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/area/AreaTypeRestTests.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client.area; @@ -22,7 +30,7 @@ public class AreaTypeRestTests extends AbstractWithLabelCRUDRestTest { private String areaTypeName = "Test Area Type Name"; - + @Override protected String knownEntityToken() { return "construction"; @@ -31,13 +39,13 @@ protected String knownEntityToken() { // ------------------------------------------------------------------------ // CREATE // ------------------------------------------------------------------------ - + @Override protected AreaTypeCreateRequest buildCreateRequest(String token) { - AreaTypeCreateRequest.Builder builder = new AreaTypeCreateRequest.Builder(token, areaTypeName); - + AreaTypeCreateRequest.Builder builder = new AreaTypeCreateRequest.Builder(token, areaTypeName); + builder.withDescription("Some description"); - + return builder.build(); } @@ -61,10 +69,10 @@ protected AreaType findEntityByToken(String token) throws SiteWhereException { @Override protected AreaTypeCreateRequest buildUpdateRequest(String token) throws SiteWhereException { - AreaTypeCreateRequest.Builder builder = new AreaTypeCreateRequest.Builder(token, areaTypeName); - + AreaTypeCreateRequest.Builder builder = new AreaTypeCreateRequest.Builder(token, areaTypeName); + builder.withDescription("Some updated description"); - + return builder.build(); } @@ -85,7 +93,7 @@ protected AreaType deleteEntity(String token) throws SiteWhereException { // ------------------------------------------------------------------------ // LIST // ------------------------------------------------------------------------ - + @Override protected SearchResults listEntities() throws SiteWhereException { AreaTypeSearchCriteria searchCriteria = new AreaTypeSearchCriteria(1, 100); diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/asset/AssetRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/asset/AssetRestTests.java index 62ea22f..91e4fbc 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/asset/AssetRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/asset/AssetRestTests.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client.asset; diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/asset/AssetTypeRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/asset/AssetTypeRestTests.java index de45495..06d136b 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/asset/AssetTypeRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/asset/AssetTypeRestTests.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client.asset; diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/batch/BatchOperationRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/batch/BatchOperationRestTests.java index cd4a7d4..7617a20 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/batch/BatchOperationRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/batch/BatchOperationRestTests.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client.batch; diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/customer/CustomerRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/customer/CustomerRestTests.java index c60a43a..d209c02 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/customer/CustomerRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/customer/CustomerRestTests.java @@ -1,10 +1,17 @@ - -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client.customer; @@ -56,7 +63,8 @@ protected CustomerCreateRequest buildCreateRequest(String token) { String customerTypeToken = "construction"; String parentToken = "acme"; String name = "Test Customer"; - CustomerCreateRequest.Builder builder = new CustomerCreateRequest.Builder(customerTypeToken, parentToken, token, name); + CustomerCreateRequest.Builder builder = new CustomerCreateRequest.Builder(customerTypeToken, parentToken, token, + name); builder.withDescription("Some customer description"); return builder.build(); } @@ -69,7 +77,7 @@ protected Customer createEntity(CustomerCreateRequest createRequest) throws Site // ------------------------------------------------------------------------ // READ // ------------------------------------------------------------------------ - + @Override protected Customer findEntityByToken(String token) throws SiteWhereException { return getClient().getCustomerByToken(getTenatAuthentication(), token); @@ -78,20 +86,20 @@ protected Customer findEntityByToken(String token) throws SiteWhereException { // ------------------------------------------------------------------------ // UPDATE // ------------------------------------------------------------------------ - + @Override protected CustomerCreateRequest buildUpdateRequest(String token) throws SiteWhereException { String customerTypeToken = "construction"; String parentToken = "acme"; String name = "Test Customer"; - CustomerCreateRequest.Builder builder = new CustomerCreateRequest.Builder(customerTypeToken, parentToken, token, name); + CustomerCreateRequest.Builder builder = new CustomerCreateRequest.Builder(customerTypeToken, parentToken, token, + name); builder.withDescription("Some updated customer description"); return builder.build(); } @Override - protected Customer updateEntity(String token, CustomerCreateRequest updateRequest) - throws SiteWhereException { + protected Customer updateEntity(String token, CustomerCreateRequest updateRequest) throws SiteWhereException { return getClient().updateCustomer(getTenatAuthentication(), token, updateRequest); } @@ -111,7 +119,7 @@ protected Customer deleteEntity(String token) throws SiteWhereException { @Override protected SearchResults listEntities() throws SiteWhereException { CustomerSearchCriteria searchCriteria = new CustomerSearchCriteria(1, 1); - CustomerResponseFormat responseFormat = new CustomerResponseFormat(); + CustomerResponseFormat responseFormat = new CustomerResponseFormat(); return getClient().listCustomers(getTenatAuthentication(), searchCriteria, responseFormat); } @@ -127,21 +135,21 @@ protected byte[] getLabelForEntity(String token, String generatorId) throws Site // ------------------------------------------------------------------------ // OTHER TESTS // ------------------------------------------------------------------------ - + @Test public void testListAlerts() throws SiteWhereException { Calendar cal = Calendar.getInstance(); - + cal.setTime(new Date()); cal.add(Calendar.YEAR, -1); - + Date startDate = cal.getTime(); Date endDate = new Date(); - + DateRangeSearchCriteria searchCriteria = new DateRangeSearchCriteria(1, 10, startDate, endDate); - SearchResults alerts = getClient() - .listAlertsForCustomer(getTenatAuthentication(), knownEntityToken(), searchCriteria); - + SearchResults alerts = getClient().listAlertsForCustomer(getTenatAuthentication(), + knownEntityToken(), searchCriteria); + assertNotNull(alerts); } @@ -149,100 +157,99 @@ public void testListAlerts() throws SiteWhereException { public void testListAssignments() throws SiteWhereException { DeviceAssignmentSearchCriteria searchCriteria = new DeviceAssignmentSearchCriteria(); DeviceAssignmentResponseFormat responseFormat = new DeviceAssignmentResponseFormat(); - SearchResults assignments = - getClient().listDeviceAssignmentsForCustomer( - getTenatAuthentication(), knownEntityToken(), searchCriteria, responseFormat); + SearchResults assignments = getClient().listDeviceAssignmentsForCustomer( + getTenatAuthentication(), knownEntityToken(), searchCriteria, responseFormat); assertNotNull(assignments); } - + @Test public void testListCommandInvocations() throws SiteWhereException { Calendar cal = Calendar.getInstance(); - + cal.setTime(new Date()); cal.add(Calendar.YEAR, -1); - + Date startDate = cal.getTime(); Date endDate = new Date(); - + DateRangeSearchCriteria searchCriteria = new DateRangeSearchCriteria(1, 10, startDate, endDate); SearchResults commandInvocations = getClient() .listCommandInvocationsForCustomer(getTenatAuthentication(), knownEntityToken(), searchCriteria); - + assertNotNull(commandInvocations); } @Test public void testListLocations() throws SiteWhereException { Calendar cal = Calendar.getInstance(); - + cal.setTime(new Date()); cal.add(Calendar.YEAR, -1); - + Date startDate = cal.getTime(); Date endDate = new Date(); - + DateRangeSearchCriteria searchCriteria = new DateRangeSearchCriteria(1, 10, startDate, endDate); SearchResults locations = getClient() .listLocationsForCustomer(getTenatAuthentication(), knownEntityToken(), searchCriteria); - + assertNotNull(locations); - } + } @Test public void testListMeasurements() throws SiteWhereException { Calendar cal = Calendar.getInstance(); - + cal.setTime(new Date()); cal.add(Calendar.YEAR, -1); - + Date startDate = cal.getTime(); Date endDate = new Date(); - + DateRangeSearchCriteria searchCriteria = new DateRangeSearchCriteria(1, 10, startDate, endDate); SearchResults measurements = getClient() .listMeasurementsForCustomer(getTenatAuthentication(), knownEntityToken(), searchCriteria); - + assertNotNull(measurements); - } + } @Test public void testListCommandResponses() throws SiteWhereException { Calendar cal = Calendar.getInstance(); - + cal.setTime(new Date()); cal.add(Calendar.YEAR, -1); - + Date startDate = cal.getTime(); Date endDate = new Date(); - + DateRangeSearchCriteria searchCriteria = new DateRangeSearchCriteria(1, 10, startDate, endDate); SearchResults commandResponses = getClient() .listCommandResponsesForCustomer(getTenatAuthentication(), knownEntityToken(), searchCriteria); - + assertNotNull(commandResponses); - } + } @Test public void testListStateChanges() throws SiteWhereException { Calendar cal = Calendar.getInstance(); - + cal.setTime(new Date()); cal.add(Calendar.YEAR, -1); - + Date startDate = cal.getTime(); Date endDate = new Date(); - + DateRangeSearchCriteria searchCriteria = new DateRangeSearchCriteria(1, 10, startDate, endDate); SearchResults stateChanges = getClient() .listStateChangesForCustomer(getTenatAuthentication(), knownEntityToken(), searchCriteria); - + assertNotNull(stateChanges); - } + } @Test public void testTree() throws SiteWhereException { List tree = getClient().customerTree(getTenatAuthentication()); assertNotNull(tree); - } + } } diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/customer/CustomerTypeRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/customer/CustomerTypeRestTests.java index c3f5459..049b8b5 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/customer/CustomerTypeRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/customer/CustomerTypeRestTests.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client.customer; @@ -45,7 +53,7 @@ protected CustomerType createEntity(CustomerTypeCreateRequest createRequest) thr // ------------------------------------------------------------------------ // READ // ------------------------------------------------------------------------ - + @Override protected CustomerType findEntityByToken(String token) throws SiteWhereException { return getClient().getCustomerTypeByToken(getTenatAuthentication(), token); @@ -54,7 +62,7 @@ protected CustomerType findEntityByToken(String token) throws SiteWhereException // ------------------------------------------------------------------------ // UPDATE // ------------------------------------------------------------------------ - + @Override protected CustomerTypeCreateRequest buildUpdateRequest(String token) throws SiteWhereException { CustomerTypeCreateRequest.Builder builder = new CustomerTypeCreateRequest.Builder(token, "test customer type"); diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceAssignmentRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceAssignmentRestTests.java index 4285cd0..fecfced 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceAssignmentRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceAssignmentRestTests.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client.device; diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceCommandRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceCommandRestTests.java index 757fc83..9399285 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceCommandRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceCommandRestTests.java @@ -1,10 +1,17 @@ - -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client.device; @@ -36,13 +43,14 @@ protected String knownEntityToken() { // ------------------------------------------------------------------------ // CREATE // ------------------------------------------------------------------------ - + @Override protected DeviceCommandCreateRequest buildCreateRequest(String token) { String deviceTypeToken = "iphone6s"; String namespace = "default"; String name = "test command"; - DeviceCommandCreateRequest.Builder builder = new DeviceCommandCreateRequest.Builder(deviceTypeToken, token, namespace, name); + DeviceCommandCreateRequest.Builder builder = new DeviceCommandCreateRequest.Builder(deviceTypeToken, token, + namespace, name); builder.withDescription("Some description"); return builder.build(); } @@ -55,7 +63,7 @@ protected DeviceCommand createEntity(DeviceCommandCreateRequest createRequest) t // ------------------------------------------------------------------------ // READ // ------------------------------------------------------------------------ - + @Override protected DeviceCommand findEntityByToken(String token) throws SiteWhereException { return getClient().getDeviceCommandByToken(getTenatAuthentication(), token); @@ -64,13 +72,14 @@ protected DeviceCommand findEntityByToken(String token) throws SiteWhereExceptio // ------------------------------------------------------------------------ // UPDATE // ------------------------------------------------------------------------ - + @Override protected DeviceCommandCreateRequest buildUpdateRequest(String token) throws SiteWhereException { String deviceTypeToken = "iphone6s"; String namespace = "default"; String name = "test command"; - DeviceCommandCreateRequest.Builder builder = new DeviceCommandCreateRequest.Builder(deviceTypeToken, token, namespace, name); + DeviceCommandCreateRequest.Builder builder = new DeviceCommandCreateRequest.Builder(deviceTypeToken, token, + namespace, name); builder.withDescription("Some updated description"); return builder.build(); } @@ -93,22 +102,23 @@ protected DeviceCommand deleteEntity(String token) throws SiteWhereException { // ------------------------------------------------------------------------ // LIST // ------------------------------------------------------------------------ - - @Override + + @Override protected SearchResults listEntities() throws SiteWhereException { DeviceCommandSearchCriteria searchCriteria = new DeviceCommandSearchCriteria(1, 1); return getClient().listDeviceCommands(getTenatAuthentication(), searchCriteria); } - // ------------------------------------------------------------------------ - // OTHER TESTS - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ + // OTHER TESTS + // ------------------------------------------------------------------------ - @Test - public void testListByNamespace() throws SiteWhereException { + @Test + public void testListByNamespace() throws SiteWhereException { DeviceCommandSearchCriteria searchCriteria = new DeviceCommandSearchCriteria(1, 1); searchCriteria.setDeviceTypeToken("iphone6s"); - SearchResults l = getClient().listDeviceCommandsByNamesapce(getTenatAuthentication(), searchCriteria); + SearchResults l = getClient().listDeviceCommandsByNamesapce(getTenatAuthentication(), + searchCriteria); assertNotNull(l); - } + } } diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceGroupRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceGroupRestTests.java index 3f2b137..860bea3 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceGroupRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceGroupRestTests.java @@ -1,10 +1,17 @@ - -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client.device; diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceRestTests.java index ca999c8..0e947ee 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceRestTests.java @@ -1,10 +1,17 @@ - -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client.device; diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceStateRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceStateRestTests.java index 764471c..7af896a 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceStateRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceStateRestTests.java @@ -1,10 +1,17 @@ - -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client.device; @@ -30,8 +37,9 @@ public class DeviceStateRestTests extends AbstractRestTest { public void testList() throws SiteWhereException { DeviceStateSearchCriteria searchCriteria = new DeviceStateSearchCriteria(1, 1); DeviceStateResponseFormat responseFormat = new DeviceStateResponseFormat(); - - SearchResults list = getClient().listDeviceStates(getTenatAuthentication(), searchCriteria, responseFormat); + + SearchResults list = getClient().listDeviceStates(getTenatAuthentication(), searchCriteria, + responseFormat); assertNotNull(list); } } diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceStatusRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceStatusRestTests.java index 76ac55d..8d30d83 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceStatusRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceStatusRestTests.java @@ -1,10 +1,17 @@ - -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client.device; @@ -30,15 +37,11 @@ protected String knownEntityToken() { // ------------------------------------------------------------------------ // CREATE // ------------------------------------------------------------------------ - + @Override protected DeviceStatusCreateRequest buildCreateRequest(String token) { - DeviceStatusCreateRequest request = DeviceStatusCreateRequest.newBuilder() - .withToken(token) - .withName("status01") - .withDeviceTypeToken("iphone6s") - .withCode(token) - .build(); + DeviceStatusCreateRequest request = DeviceStatusCreateRequest.newBuilder().withToken(token).withName("status01") + .withDeviceTypeToken("iphone6s").withCode(token).build(); return request; } @@ -50,7 +53,7 @@ protected DeviceStatus createEntity(DeviceStatusCreateRequest createRequest) thr // ------------------------------------------------------------------------ // READ // ------------------------------------------------------------------------ - + @Override protected DeviceStatus findEntityByToken(String token) throws SiteWhereException { return getClient().getDeviceStatusByToken(getTenatAuthentication(), token); @@ -59,15 +62,11 @@ protected DeviceStatus findEntityByToken(String token) throws SiteWhereException // ------------------------------------------------------------------------ // UPDATE // ------------------------------------------------------------------------ - + @Override protected DeviceStatusCreateRequest buildUpdateRequest(String token) throws SiteWhereException { - DeviceStatusCreateRequest request = DeviceStatusCreateRequest.newBuilder() - .withToken(token) - .withName("status01-updated") - .withDeviceTypeToken("iphone6s") - .withCode(token) - .build(); + DeviceStatusCreateRequest request = DeviceStatusCreateRequest.newBuilder().withToken(token) + .withName("status01-updated").withDeviceTypeToken("iphone6s").withCode(token).build(); return request; } diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceTypeRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceTypeRestTests.java index 7d39c22..e1ba516 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceTypeRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/DeviceTypeRestTests.java @@ -1,10 +1,17 @@ - -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client.device; @@ -109,7 +116,7 @@ protected byte[] getLabelForEntity(String token, String generatorId) throws Site // ------------------------------------------------------------------------ // OTHER TESTS // ------------------------------------------------------------------------ - + @Test public void testGetDeviceTypeGPBSpecification() throws SiteWhereException { String spec = getClient().getDeviceTypeGPBSpecification(getTenatAuthentication(), knownEntityToken()); diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/ZoneRestTest.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/ZoneRestTest.java index e00afaa..1c5935f 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/ZoneRestTest.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/device/ZoneRestTest.java @@ -1,10 +1,17 @@ - -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client.device; diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/scheduling/ScheduleRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/scheduling/ScheduleRestTests.java index fc42d7c..a09c945 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/scheduling/ScheduleRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/scheduling/ScheduleRestTests.java @@ -1,10 +1,17 @@ - -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client.scheduling; @@ -23,25 +30,25 @@ * @author Jorge Villaverde * */ -public class ScheduleRestTests extends AbstractCRUDRestClientTests{ +public class ScheduleRestTests extends AbstractCRUDRestClientTests { @Override protected String knownEntityToken() { return "weekly"; } - + // ------------------------------------------------------------------------ // CREATE // ------------------------------------------------------------------------ - + @Override protected ScheduleCreateRequest buildCreateRequest(String token) throws SiteWhereException { String name = "test schedule"; ScheduleCreateRequest.Builder builder = new ScheduleCreateRequest.Builder(token, name); - + builder.withStartDate(new Date()); builder.withSimpleSchedule(10000l, 1); - + return builder.build(); } @@ -67,10 +74,10 @@ protected Schedule findEntityByToken(String token) throws SiteWhereException { protected ScheduleCreateRequest buildUpdateRequest(String token) throws SiteWhereException { String name = "test schedule"; ScheduleCreateRequest.Builder builder = new ScheduleCreateRequest.Builder(token, name); - + builder.withStartDate(new Date()); builder.withSimpleSchedule(10000l, 2); - + return builder.build(); } @@ -91,12 +98,12 @@ protected Schedule deleteEntity(String token) throws SiteWhereException { // ------------------------------------------------------------------------ // LIST // ------------------------------------------------------------------------ - + @Override protected SearchResults listEntities() throws SiteWhereException { ScheduleSearchCriteria searchCriteria = new ScheduleSearchCriteria(0, 10); ScheduleResponseFormat responseFormat = new ScheduleResponseFormat(); return getClient().listSchedules(getTenatAuthentication(), searchCriteria, responseFormat); } - + } diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/scheduling/ScheduledJobRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/scheduling/ScheduledJobRestTests.java index 9bad2d2..309acf8 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/scheduling/ScheduledJobRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/scheduling/ScheduledJobRestTests.java @@ -1,10 +1,17 @@ - -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client.scheduling; @@ -25,17 +32,17 @@ * @author Jorge Villaverde * */ -public class ScheduledJobRestTests extends AbstractCRUDRestClientTests{ +public class ScheduledJobRestTests extends AbstractCRUDRestClientTests { @Override protected String knownEntityToken() { return "weekly"; } - + // ------------------------------------------------------------------------ // CREATE // ------------------------------------------------------------------------ - + @Override protected ScheduledJobCreateRequest buildCreateRequest(String token) throws SiteWhereException { ScheduledJobCreateRequest request = new ScheduledJobCreateRequest(); @@ -77,7 +84,8 @@ protected ScheduledJobCreateRequest buildUpdateRequest(String token) throws Site } @Override - protected ScheduledJob updateEntity(String token, ScheduledJobCreateRequest updateRequest) throws SiteWhereException { + protected ScheduledJob updateEntity(String token, ScheduledJobCreateRequest updateRequest) + throws SiteWhereException { return getClient().updateScheduledJob(getTenatAuthentication(), token, updateRequest); } @@ -93,12 +101,12 @@ protected ScheduledJob deleteEntity(String token) throws SiteWhereException { // ------------------------------------------------------------------------ // LIST // ------------------------------------------------------------------------ - + @Override protected SearchResults listEntities() throws SiteWhereException { ScheduledJobSearchCriteria searchCriteria = new ScheduledJobSearchCriteria(0, 10); ScheduledJobResponseFormat responseFormat = new ScheduledJobResponseFormat(); return getClient().listScheduledJobs(getTenatAuthentication(), searchCriteria, responseFormat); } - + } diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/AuthoritiesRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/AuthoritiesRestTests.java index e55a617..c9397f2 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/AuthoritiesRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/AuthoritiesRestTests.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client.user; @@ -23,6 +31,7 @@ /** * Authorities API tests. + * * @author Jorge Villaverde */ public class AuthoritiesRestTests extends AbstractRestTest { @@ -32,7 +41,7 @@ public void testListAutorities() throws SiteWhereException { SearchResults auths = getClient().listAuthorities(getTenatAuthentication()); assertNotNull(auths); } - + @Test public void testGetAutorityByName() throws SiteWhereException { GrantedAuthority auth = getClient().getAuthorityByName(getTenatAuthentication(), "GRP_SERVER"); @@ -42,11 +51,11 @@ public void testGetAutorityByName() throws SiteWhereException { @Test public void testCreateAutority() throws SiteWhereException { GrantedAuthorityCreateRequest request = new GrantedAuthorityCreateRequest(); - + request.setAuthority(UUID.randomUUID().toString()); request.setDescription("Some description"); request.setGroup(false); - + GrantedAuthority auth = getClient().createAuthority(getTenatAuthentication(), request); assertNotNull(auth); } diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java index 9b34262..247f3d2 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java @@ -1,10 +1,17 @@ - -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.client.user; diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/test/StompTest.java b/sitewhere-java-client/src/test/java/com/sitewhere/test/StompTest.java index 6f5f8e7..fda5e25 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/test/StompTest.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/test/StompTest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.test; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/Area.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/Area.java index f50e973..fd27b68 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/Area.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/Area.java @@ -1,9 +1,17 @@ /* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * Copyright © 2014-2020 The SiteWhere Authors * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.area; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/AreaType.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/AreaType.java index 0192264..0cea1a9 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/AreaType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/AreaType.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.area; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/Zone.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/Zone.java index d0dd2fc..7903300 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/Zone.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/Zone.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.area; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/AreaCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/AreaCreateRequest.java index 4cdbbf2..83df273 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/AreaCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/AreaCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.area.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/AreaTypeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/AreaTypeCreateRequest.java index c5a315f..5476f40 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/AreaTypeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/AreaTypeCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.area.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/ZoneCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/ZoneCreateRequest.java index 3f91b80..cfd3b35 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/ZoneCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/area/request/ZoneCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.area.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/Asset.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/Asset.java index 2a53d79..0642387 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/Asset.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/Asset.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.asset; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/AssetType.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/AssetType.java index b990cd1..0ca8c61 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/AssetType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/AssetType.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.asset; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/marshaling/MarshaledAsset.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/marshaling/MarshaledAsset.java index 8accefa..95c3546 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/marshaling/MarshaledAsset.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/marshaling/MarshaledAsset.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.asset.marshaling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/request/AssetCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/request/AssetCreateRequest.java index 0f03c92..6e7fef4 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/request/AssetCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/request/AssetCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.asset.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/request/AssetTypeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/request/AssetTypeCreateRequest.java index 4294f15..048a04f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/request/AssetTypeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/asset/request/AssetTypeCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.asset.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/BatchElement.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/BatchElement.java index 539f888..be67216 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/BatchElement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/BatchElement.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.batch; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/BatchOperation.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/BatchOperation.java index eb1682c..9246014 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/BatchOperation.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/BatchOperation.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.batch; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/MarshaledBatchElement.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/MarshaledBatchElement.java index e3faa62..507ba30 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/MarshaledBatchElement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/MarshaledBatchElement.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.batch; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/MarshaledBatchOperation.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/MarshaledBatchOperation.java index e9e658f..03f1a90 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/MarshaledBatchOperation.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/MarshaledBatchOperation.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.batch; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/kafka/UnprocessedBatchElement.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/kafka/UnprocessedBatchElement.java index 2bf7b3d..91dbc7f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/kafka/UnprocessedBatchElement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/kafka/UnprocessedBatchElement.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.batch.kafka; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/kafka/UnprocessedBatchOperation.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/kafka/UnprocessedBatchOperation.java index dc4f161..1ef8bfb 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/kafka/UnprocessedBatchOperation.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/kafka/UnprocessedBatchOperation.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.batch.kafka; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/BatchCommandInvocationRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/BatchCommandInvocationRequest.java index 72eea94..fc3277c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/BatchCommandInvocationRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/BatchCommandInvocationRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.batch.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/BatchElementCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/BatchElementCreateRequest.java index 8234e2d..ad4d6a3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/BatchElementCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/BatchElementCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.batch.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/BatchOperationCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/BatchOperationCreateRequest.java index 5c3ed43..9590a42 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/BatchOperationCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/BatchOperationCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.batch.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/BatchOperationUpdateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/BatchOperationUpdateRequest.java index 8cfeb57..a07fdb9 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/BatchOperationUpdateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/BatchOperationUpdateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.batch.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/InvocationByAssignmentCriteriaRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/InvocationByAssignmentCriteriaRequest.java index 11512eb..1a09dcf 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/InvocationByAssignmentCriteriaRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/InvocationByAssignmentCriteriaRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.batch.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/InvocationByDeviceCriteriaRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/InvocationByDeviceCriteriaRequest.java index 335ccef..6db6a31 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/InvocationByDeviceCriteriaRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/batch/request/InvocationByDeviceCriteriaRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.batch.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/command/CommandResponse.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/command/CommandResponse.java index f091396..1f6a9af 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/command/CommandResponse.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/command/CommandResponse.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/BrandedEntity.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/BrandedEntity.java index 7b89eb2..6b757ca 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/BrandedEntity.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/BrandedEntity.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.common; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/Location.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/Location.java index 4f3089d..e90a501 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/Location.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/Location.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.common; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/MetadataProvider.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/MetadataProvider.java index a6a7e97..93812d9 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/MetadataProvider.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/MetadataProvider.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.common; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/PersistentEntity.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/PersistentEntity.java index 9354367..d7af58e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/PersistentEntity.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/PersistentEntity.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.common; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/request/BrandedEntityCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/request/BrandedEntityCreateRequest.java index 762cd1f..fcc317f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/request/BrandedEntityCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/request/BrandedEntityCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.common.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/request/PersistentEntityCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/request/PersistentEntityCreateRequest.java index c5ac161..dbf672e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/request/PersistentEntityCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/common/request/PersistentEntityCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.common.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/Customer.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/Customer.java index 7449fbb..ac1521c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/Customer.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/Customer.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.customer; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/CustomerType.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/CustomerType.java index 0631e17..d6435bb 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/CustomerType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/CustomerType.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.customer; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/request/CustomerCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/request/CustomerCreateRequest.java index 4c58965..4ec075a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/request/CustomerCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/request/CustomerCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.customer.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/request/CustomerTypeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/request/CustomerTypeCreateRequest.java index c634ccd..3c55882 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/request/CustomerTypeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/customer/request/CustomerTypeCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.customer.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/Device.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/Device.java index 0a2cf5f..5978782 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/Device.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/Device.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAlarm.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAlarm.java index 2ceeff4..7692b65 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAlarm.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAlarm.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignment.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignment.java index 1ad4f5e..85cd166 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignment.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignment.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignmentSummary.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignmentSummary.java index 73012e8..2807cf1 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignmentSummary.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceAssignmentSummary.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceElementMapping.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceElementMapping.java index 6193bcb..755690d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceElementMapping.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceElementMapping.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceStatus.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceStatus.java index a755a0e..843ddd4 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceStatus.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceStatus.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceSummary.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceSummary.java index 39b260e..8e6f541 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceSummary.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceSummary.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceType.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceType.java index 6281b71..d731a23 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/DeviceType.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceAlertWithAsset.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceAlertWithAsset.java index d12a065..d212d5b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceAlertWithAsset.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceAlertWithAsset.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.asset; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceCommandResponseWithAsset.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceCommandResponseWithAsset.java index 5a8369b..db6185d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceCommandResponseWithAsset.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceCommandResponseWithAsset.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.asset; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceEventWithAsset.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceEventWithAsset.java index b817def..83f94f6 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceEventWithAsset.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceEventWithAsset.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.asset; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceLocationWithAsset.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceLocationWithAsset.java index b20c719..0936704 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceLocationWithAsset.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceLocationWithAsset.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.asset; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceMeasurementWithAsset.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceMeasurementWithAsset.java index 0db8774..9e6bb25 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceMeasurementWithAsset.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceMeasurementWithAsset.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.asset; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceStateChangeWithAsset.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceStateChangeWithAsset.java index 3aeaaa2..ab6435d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceStateChangeWithAsset.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/asset/DeviceStateChangeWithAsset.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.asset; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/charting/ChartEntry.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/charting/ChartEntry.java index 048db57..3019b12 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/charting/ChartEntry.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/charting/ChartEntry.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.charting; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/charting/ChartSeries.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/charting/ChartSeries.java index a56ce53..e91d88c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/charting/ChartSeries.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/charting/ChartSeries.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.charting; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/CommandParameter.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/CommandParameter.java index 69b30a3..6c7878e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/CommandParameter.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/CommandParameter.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceCommand.java index e847b69..acd088a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceCommand.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceCommandExecution.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceCommandExecution.java index ecd75e8..444eed5 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceCommandExecution.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceCommandExecution.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceCommandNamespace.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceCommandNamespace.java index 6d8e15d..6c21169 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceCommandNamespace.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceCommandNamespace.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceMappingAckCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceMappingAckCommand.java index 0557a13..461086f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceMappingAckCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceMappingAckCommand.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceStreamAckCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceStreamAckCommand.java index 013f7a9..6f8b624 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceStreamAckCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/DeviceStreamAckCommand.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/RegistrationAckCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/RegistrationAckCommand.java index 3fe238b..c41d938 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/RegistrationAckCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/RegistrationAckCommand.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/RegistrationFailureCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/RegistrationFailureCommand.java index 4e2f27e..2663335 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/RegistrationFailureCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/RegistrationFailureCommand.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/SendDeviceStreamDataCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/SendDeviceStreamDataCommand.java index d4e5e22..e1a0bb2 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/SendDeviceStreamDataCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/SendDeviceStreamDataCommand.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/SystemCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/SystemCommand.java index 78142d2..115867f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/SystemCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/command/SystemCommand.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/communication/DeviceRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/communication/DeviceRequest.java index 837ddd2..4d1f173 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/communication/DeviceRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/communication/DeviceRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.communication; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceElement.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceElement.java index f5d1044..1bb1f97 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceElement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceElement.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.element; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceElementSchema.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceElementSchema.java index 4c8785c..c340b28 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceElementSchema.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceElementSchema.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.element; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceSlot.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceSlot.java index d5f6fca..cab92de 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceSlot.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceSlot.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.element; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceUnit.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceUnit.java index 9c700eb..4365815 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceUnit.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/element/DeviceUnit.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.element; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceAlert.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceAlert.java index 10f5400..4721c45 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceAlert.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceAlert.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceCommandInvocation.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceCommandInvocation.java index 122e7e6..bba465f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceCommandInvocation.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceCommandInvocation.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceCommandResponse.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceCommandResponse.java index 36bdee0..fd91a88 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceCommandResponse.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceCommandResponse.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEvent.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEvent.java index dc9dc35..93fbccb 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEvent.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEvent.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventBatch.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventBatch.java index 5aa28b3..a55ec05 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventBatch.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventBatch.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventBatchResponse.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventBatchResponse.java index 0b9b021..ff76089 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventBatchResponse.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventBatchResponse.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventContext.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventContext.java index 26ab9f0..6706198 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventContext.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventContext.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventOriginator.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventOriginator.java index e54c184..9472f6e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventOriginator.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceEventOriginator.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceLocation.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceLocation.java index 02fc38b..3675d90 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceLocation.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceLocation.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceMeasurement.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceMeasurement.java index 91880d5..8c25bfa 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceMeasurement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceMeasurement.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceStateChange.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceStateChange.java index 4749405..52766e6 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceStateChange.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/DeviceStateChange.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/DecodedEventPayload.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/DecodedEventPayload.java index 99e0cb5..734a09d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/DecodedEventPayload.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/DecodedEventPayload.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event.kafka; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/DeviceRegistrationPayload.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/DeviceRegistrationPayload.java index 8c18011..a84f2a9 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/DeviceRegistrationPayload.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/DeviceRegistrationPayload.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event.kafka; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/PreprocessedEventPayload.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/PreprocessedEventPayload.java index acafb59..5398653 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/PreprocessedEventPayload.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/PreprocessedEventPayload.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event.kafka; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/ProcessedEventPayload.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/ProcessedEventPayload.java index 4cb6c06..c58e2f0 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/ProcessedEventPayload.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/kafka/ProcessedEventPayload.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event.kafka; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceAlertCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceAlertCreateRequest.java index c2a06aa..9471832 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceAlertCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceAlertCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceAssignmentEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceAssignmentEventCreateRequest.java index 4c34712..578a0d0 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceAssignmentEventCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceAssignmentEventCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceCommandInvocationCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceCommandInvocationCreateRequest.java index eac48aa..5dc9583 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceCommandInvocationCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceCommandInvocationCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceCommandResponseCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceCommandResponseCreateRequest.java index 8da239c..370030b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceCommandResponseCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceCommandResponseCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceEventCreateRequest.java index cec9301..e72b134 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceEventCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceEventCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceLocationCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceLocationCreateRequest.java index 39717aa..cd5f1ee 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceLocationCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceLocationCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceMeasurementCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceMeasurementCreateRequest.java index 1639793..c7519cf 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceMeasurementCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceMeasurementCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceRegistrationRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceRegistrationRequest.java index 67f7bf5..241a6df 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceRegistrationRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceRegistrationRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceStateChangeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceStateChangeCreateRequest.java index 9999fdc..e5cd412 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceStateChangeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceStateChangeCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/SendDeviceStreamDataRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/SendDeviceStreamDataRequest.java index 36378c4..2f7cba8 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/SendDeviceStreamDataRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/SendDeviceStreamDataRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/scripting/DeviceEventSupport.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/scripting/DeviceEventSupport.java index a171c29..80704c3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/scripting/DeviceEventSupport.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/scripting/DeviceEventSupport.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event.scripting; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/streaming/EventStreamAck.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/streaming/EventStreamAck.java index 29d6da0..2805fd5 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/streaming/EventStreamAck.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/streaming/EventStreamAck.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event.streaming; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/view/DeviceCommandInvocationSummary.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/view/DeviceCommandInvocationSummary.java index 2929f3e..467fefa 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/view/DeviceCommandInvocationSummary.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/view/DeviceCommandInvocationSummary.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.event.view; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/group/DeviceGroup.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/group/DeviceGroup.java index 50192d5..ecbce97 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/group/DeviceGroup.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/group/DeviceGroup.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.group; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/group/DeviceGroupElement.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/group/DeviceGroupElement.java index ad06565..0f1f131 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/group/DeviceGroupElement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/group/DeviceGroupElement.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.group; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledArea.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledArea.java index 3a7b318..93b854d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledArea.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledArea.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.marshaling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledAreaType.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledAreaType.java index 06fe37f..8b7d30c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledAreaType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledAreaType.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.marshaling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledCustomer.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledCustomer.java index c5f67d5..ba67fc7 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledCustomer.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledCustomer.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.marshaling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledCustomerType.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledCustomerType.java index 9b90857..067eae5 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledCustomerType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledCustomerType.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.marshaling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDevice.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDevice.java index 6fa2566..1e7fde5 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDevice.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDevice.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.marshaling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceAssignment.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceAssignment.java index 1e41aa1..88dcfe1 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceAssignment.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceAssignment.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.marshaling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceCommandInvocation.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceCommandInvocation.java index 75e1a6a..3f11c1d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceCommandInvocation.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceCommandInvocation.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.marshaling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceGroupElement.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceGroupElement.java index 2b2e6e8..ea96ab1 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceGroupElement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceGroupElement.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.marshaling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceState.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceState.java index ff415d5..874bc05 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceState.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/marshaling/MarshaledDeviceState.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.marshaling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceAlarmCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceAlarmCreateRequest.java index 2ab3b3b..2376820 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceAlarmCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceAlarmCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceAssignmentBulkRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceAssignmentBulkRequest.java index b520b7e..ee27a4c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceAssignmentBulkRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceAssignmentBulkRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceAssignmentCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceAssignmentCreateRequest.java index b9ba102..285b428 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceAssignmentCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceAssignmentCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceCommandCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceCommandCreateRequest.java index 8519311..0ca1b10 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceCommandCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceCommandCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceCreateRequest.java index ca85c6b..1a9fe23 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceGroupCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceGroupCreateRequest.java index 4753351..50b05c1 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceGroupCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceGroupCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceGroupElementCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceGroupElementCreateRequest.java index 72b2193..d5659e6 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceGroupElementCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceGroupElementCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceStatusCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceStatusCreateRequest.java index bc895a3..f4a18cd 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceStatusCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceStatusCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.request; @@ -17,16 +25,16 @@ public class DeviceStatusCreateRequest extends PersistentEntityCreateRequest imp /** Serial version UID */ private static final long serialVersionUID = -1667891345754538713L; - + /** Default Background Color */ public static final String DEFAULT_BACKGROUD_COLOR = "#FFFFFF"; /** Default Foreground Color */ public static final String DEFAULT_FOREGROUND_COLOR = "#000000"; - + /** Default Border Color */ public static final String DEFAULT_BORDER_COLOR = "#000000"; - + /** Default Icon */ public static final String DEFAULT_ICON = "fa-question"; @@ -150,15 +158,15 @@ public String getIcon() { public void setIcon(String icon) { this.icon = icon; } - + public static Builder newBuilder() { return new Builder(); } - + public static class Builder { private DeviceStatusCreateRequest build; - + private Builder() { super(); this.build = new DeviceStatusCreateRequest(); @@ -167,22 +175,22 @@ private Builder() { withBorderColor(DEFAULT_BORDER_COLOR); withIcon(DEFAULT_ICON); } - + public Builder withToken(String token) { this.build.setToken(token); return this; } - + public Builder withDeviceTypeToken(String deviceTypeToken) { this.build.setDeviceTypeToken(deviceTypeToken); return this; } - + public Builder withCode(String code) { this.build.setCode(code); return this; } - + public Builder withName(String name) { this.build.setName(name); return this; @@ -207,7 +215,7 @@ public Builder withIcon(String icon) { this.build.setIcon(icon); return this; } - + public DeviceStatusCreateRequest build() { return this.build; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceStreamCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceStreamCreateRequest.java index ec41236..491a210 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceStreamCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceStreamCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceTypeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceTypeCreateRequest.java index 7b1055d..b329324 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceTypeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/request/DeviceTypeCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/DeviceState.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/DeviceState.java index f042961..da71a24 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/DeviceState.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/DeviceState.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.state; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/RecentStateEvent.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/RecentStateEvent.java index 7fed386..68df92b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/RecentStateEvent.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/RecentStateEvent.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.state; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/DeviceStateCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/DeviceStateCreateRequest.java index b6af389..68b5996 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/DeviceStateCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/DeviceStateCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.state.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/DeviceStateEventMergeRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/DeviceStateEventMergeRequest.java index c2897b6..4a334e4 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/DeviceStateEventMergeRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/DeviceStateEventMergeRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.state.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentLocationEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentLocationEventCreateRequest.java index d427077..3a54658 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentLocationEventCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentLocationEventCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.state.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentMeasurementEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentMeasurementEventCreateRequest.java index 7edd363..bb754a2 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentMeasurementEventCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentMeasurementEventCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.state.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentStateEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentStateEventCreateRequest.java index 8dc9dd0..73e7164 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentStateEventCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/state/request/RecentStateEventCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.state.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/streaming/DeviceStream.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/streaming/DeviceStream.java index 71edb55..f10a102 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/streaming/DeviceStream.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/streaming/DeviceStream.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.streaming; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/streaming/DeviceStreamData.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/streaming/DeviceStreamData.java index 6d1f917..c2fd0ad 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/streaming/DeviceStreamData.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/streaming/DeviceStreamData.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.streaming; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/streaming/request/DeviceStreamDataCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/streaming/request/DeviceStreamDataCreateRequest.java index 40b8ae9..3cc6471 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/streaming/request/DeviceStreamDataCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/streaming/request/DeviceStreamDataCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.streaming.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/support/DeviceAssignmentHistoryEntry.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/support/DeviceAssignmentHistoryEntry.java index 4f4de69..773ea4f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/support/DeviceAssignmentHistoryEntry.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/support/DeviceAssignmentHistoryEntry.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.support; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/support/InterpolatedAssignmentHistory.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/support/InterpolatedAssignmentHistory.java index ae92a52..5c6a11d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/support/InterpolatedAssignmentHistory.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/support/InterpolatedAssignmentHistory.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.device.support; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/label/Label.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/label/Label.java index 31739e2..78fcbf5 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/label/Label.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/label/Label.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.label; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/microservice/MicroserviceSummary.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/microservice/MicroserviceSummary.java index e9ac526..c25598f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/microservice/MicroserviceSummary.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/microservice/MicroserviceSummary.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.microservice; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/Schedule.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/Schedule.java index 6560636..8f6b7e4 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/Schedule.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/Schedule.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.scheduling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/ScheduledJob.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/ScheduledJob.java index d97ca48..441adc3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/ScheduledJob.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/ScheduledJob.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.scheduling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/request/ScheduleCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/request/ScheduleCreateRequest.java index 1aa00e3..41f59ba 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/request/ScheduleCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/request/ScheduleCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.scheduling.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/request/ScheduledJobCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/request/ScheduledJobCreateRequest.java index f5ae5ef..af48dbc 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/request/ScheduledJobCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/scheduling/request/ScheduledJobCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.scheduling.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/AssetSearchResults.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/AssetSearchResults.java index 117274f..19fb4a5 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/AssetSearchResults.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/AssetSearchResults.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DateRangeSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DateRangeSearchCriteria.java index c401d17..ad7b00b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DateRangeSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DateRangeSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceAlertSearchResults.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceAlertSearchResults.java index a28e713..c74071b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceAlertSearchResults.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceAlertSearchResults.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceAssignmentSearchResults.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceAssignmentSearchResults.java index 2950616..83bc39e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceAssignmentSearchResults.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceAssignmentSearchResults.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceCommandInvocationSearchResults.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceCommandInvocationSearchResults.java index 5368614..600fc32 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceCommandInvocationSearchResults.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceCommandInvocationSearchResults.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceCommandSearchResults.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceCommandSearchResults.java index 548e109..a0c4cd9 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceCommandSearchResults.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceCommandSearchResults.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceGroupElementSearchResults.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceGroupElementSearchResults.java index 9626cf5..1bb4f98 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceGroupElementSearchResults.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceGroupElementSearchResults.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceGroupSearchResults.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceGroupSearchResults.java index a242e63..3ce7c39 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceGroupSearchResults.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceGroupSearchResults.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceLocationSearchResults.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceLocationSearchResults.java index f883811..0dd3e94 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceLocationSearchResults.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceLocationSearchResults.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceMeasurementsSearchResults.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceMeasurementsSearchResults.java index bd12c98..0d33596 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceMeasurementsSearchResults.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceMeasurementsSearchResults.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceSearchResults.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceSearchResults.java index 8e04a99..283eb4b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceSearchResults.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceSearchResults.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceStreamDataSearchResults.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceStreamDataSearchResults.java index 7132ed9..bb2057f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceStreamDataSearchResults.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceStreamDataSearchResults.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceStreamSearchResults.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceStreamSearchResults.java index 3592c40..47c04d7 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceStreamSearchResults.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceStreamSearchResults.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceTypeSearchResults.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceTypeSearchResults.java index c231de1..96cb9c8 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceTypeSearchResults.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/DeviceTypeSearchResults.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/Pager.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/Pager.java index 59c20dc..d98b596 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/Pager.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/Pager.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/SearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/SearchCriteria.java index b436761..ae58a78 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/SearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/SearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/SearchResults.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/SearchResults.java index 3739013..69c909b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/SearchResults.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/SearchResults.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/TreeNode.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/TreeNode.java index f66ddc9..e276860 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/TreeNode.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/TreeNode.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/ZoneSearchResults.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/ZoneSearchResults.java index 9853eed..f1ae1a0 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/ZoneSearchResults.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/ZoneSearchResults.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/area/AreaResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/area/AreaResponseFormat.java index 1d6c031..fbe85d0 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/area/AreaResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/area/AreaResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.area; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/area/AreaSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/area/AreaSearchCriteria.java index 506cfe9..b941246 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/area/AreaSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/area/AreaSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.area; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/area/AreaTypeSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/area/AreaTypeSearchCriteria.java index 381176c..cc8a78a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/area/AreaTypeSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/area/AreaTypeSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.area; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/asset/AssetSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/asset/AssetSearchCriteria.java index 6b5882c..1f0887c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/asset/AssetSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/asset/AssetSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.asset; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/asset/AssetTypeSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/asset/AssetTypeSearchCriteria.java index 1a267ab..65e1394 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/asset/AssetTypeSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/asset/AssetTypeSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.asset; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/batch/BatchOperationSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/batch/BatchOperationSearchCriteria.java index 882d17f..e102348 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/batch/BatchOperationSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/batch/BatchOperationSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.batch; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/customer/CustomerResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/customer/CustomerResponseFormat.java index 2d686b4..523f6cd 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/customer/CustomerResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/customer/CustomerResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.customer; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/customer/CustomerSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/customer/CustomerSearchCriteria.java index 4ac83c1..2057f8b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/customer/CustomerSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/customer/CustomerSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.customer; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/customer/CustomerTypeResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/customer/CustomerTypeResponseFormat.java index 54b5c15..b079a1a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/customer/CustomerTypeResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/customer/CustomerTypeResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.customer; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/customer/CustomerTypeSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/customer/CustomerTypeSearchCriteria.java index 62811ef..de657d7 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/customer/CustomerTypeSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/customer/CustomerTypeSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.customer; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/BatchElementSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/BatchElementSearchCriteria.java index 076dd46..8e2d3a8 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/BatchElementSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/BatchElementSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceAlarmSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceAlarmSearchCriteria.java index 15f7a20..d03e769 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceAlarmSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceAlarmSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceAssignmentResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceAssignmentResponseFormat.java index 8b6bdcc..be1be88 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceAssignmentResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceAssignmentResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceAssignmentSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceAssignmentSearchCriteria.java index 263b6be..6c2c92d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceAssignmentSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceAssignmentSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceByGroupResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceByGroupResponseFormat.java index e3fd7e3..f5f0c50 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceByGroupResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceByGroupResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceCommandSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceCommandSearchCriteria.java index 5a75c6d..5fc2032 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceCommandSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceCommandSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceGroupElementResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceGroupElementResponseFormat.java index 9d54a4a..d4a8fb4 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceGroupElementResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceGroupElementResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceGroupElementSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceGroupElementSearchCriteria.java index a32986f..657ae0c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceGroupElementSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceGroupElementSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceGroupSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceGroupSearchCriteria.java index fdeccc2..09633c9 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceGroupSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceGroupSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceResponseFormat.java index c29c763..dd6c295 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceSearchCriteria.java index 482d73f..112a1a8 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceStateResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceStateResponseFormat.java index 88a4144..2631e75 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceStateResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceStateResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceStateSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceStateSearchCriteria.java index 96dbdfb..c0a4d15 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceStateSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceStateSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceStatusSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceStatusSearchCriteria.java index 370a09d..6e1e68a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceStatusSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceStatusSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceTypeResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceTypeResponseFormat.java index fcf3cc7..6f42499 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceTypeResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceTypeResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceTypeSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceTypeSearchCriteria.java index 3040a8f..88b8bc5 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceTypeSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/DeviceTypeSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/RecentStateEventSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/RecentStateEventSearchCriteria.java index 65a2da8..e04f8cb 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/RecentStateEventSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/RecentStateEventSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/ZoneSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/ZoneSearchCriteria.java index b989894..fe923e3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/ZoneSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/device/ZoneSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/scheduling/ScheduleResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/scheduling/ScheduleResponseFormat.java index e97a55f..6300d6b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/scheduling/ScheduleResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/scheduling/ScheduleResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.scheduling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/scheduling/ScheduleSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/scheduling/ScheduleSearchCriteria.java index 833793b..1894ce5 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/scheduling/ScheduleSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/scheduling/ScheduleSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.scheduling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/scheduling/ScheduledJobResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/scheduling/ScheduledJobResponseFormat.java index c247a4e..43ebbbd 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/scheduling/ScheduledJobResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/scheduling/ScheduledJobResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.scheduling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/scheduling/ScheduledJobSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/scheduling/ScheduledJobSearchCriteria.java index 5a959a8..97a30ff 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/scheduling/ScheduledJobSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/scheduling/ScheduledJobSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.scheduling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/tenant/TenantSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/tenant/TenantSearchCriteria.java index 1633c7d..2975162 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/tenant/TenantSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/tenant/TenantSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.tenant; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/tenant/TenantSearchResults.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/tenant/TenantSearchResults.java index 381c361..25b8d0d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/tenant/TenantSearchResults.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/tenant/TenantSearchResults.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.tenant; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/user/UserSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/user/UserSearchCriteria.java index ad8f719..18b2655 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/user/UserSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/user/UserSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.user; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/user/UserSearchResults.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/user/UserSearchResults.java index 8fd4cad..71eaa8f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/user/UserSearchResults.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/search/user/UserSearchResults.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.search.user; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/system/Version.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/system/Version.java index aaa6522..c90bd5a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/system/Version.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/system/Version.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.system; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/Tenant.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/Tenant.java index b7ef69a..eef88b4 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/Tenant.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/Tenant.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.tenant; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/request/TenantCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/request/TenantCreateRequest.java index 0fb0099..71ca1c1 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/request/TenantCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/request/TenantCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.tenant.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/GrantedAuthority.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/GrantedAuthority.java index 040e2ec..25f07c3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/GrantedAuthority.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/GrantedAuthority.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.user; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/GrantedAuthorityHierarchyBuilder.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/GrantedAuthorityHierarchyBuilder.java index 4aa91c7..f8963f1 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/GrantedAuthorityHierarchyBuilder.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/GrantedAuthorityHierarchyBuilder.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.user; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/GrantedAuthorityHierarchyNode.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/GrantedAuthorityHierarchyNode.java index 371791c..d7fda53 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/GrantedAuthorityHierarchyNode.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/GrantedAuthorityHierarchyNode.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.user; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/GrantedAuthoritySearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/GrantedAuthoritySearchCriteria.java index 5fe5a1c..06cb72d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/GrantedAuthoritySearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/GrantedAuthoritySearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.user; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/Role.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/Role.java index cf93b07..c8e85a6 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/Role.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/Role.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.user; @@ -45,7 +53,7 @@ public String getDescription() { @Override public List getAuthorities() { - return this.authorities; + return this.authorities; } public void setRole(String role) { @@ -57,7 +65,7 @@ public void setDescription(String description) { } public void setAuthorities(List authorities) { - this.authorities = authorities; + this.authorities = authorities; } /** diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/RoleSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/RoleSearchCriteria.java index 5d477bd..a77cca3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/RoleSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/RoleSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.user; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java index ef1e385..c2b9120 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.user; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/GrantedAuthorityCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/GrantedAuthorityCreateRequest.java index 5d9e253..907331b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/GrantedAuthorityCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/GrantedAuthorityCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.user.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/RoleCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/RoleCreateRequest.java index dd88410..55096cd 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/RoleCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/RoleCreateRequest.java @@ -1,19 +1,28 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.user.request; + import com.sitewhere.spi.user.request.IRoleCreateRequest; import java.util.ArrayList; import java.util.List; /** - * Default implementation of {@link IRoleCreateRequest} for use in - * REST services. + * Default implementation of {@link IRoleCreateRequest} for use in REST + * services. */ public class RoleCreateRequest implements IRoleCreateRequest { @@ -30,36 +39,35 @@ public class RoleCreateRequest implements IRoleCreateRequest { private List authorities = new ArrayList<>(); /* - * @see - * com.sitewhere.spi.user.request.IRoleCreateRequest#getRole() + * @see com.sitewhere.spi.user.request.IRoleCreateRequest#getRole() */ @Override public String getRole() { - return this.role; + return this.role; } public void setRole(String role) { - this.role = role; + this.role = role; } /* - * @see - * com.sitewhere.spi.user.request.IRoleCreateRequest#getDescription() + * @see com.sitewhere.spi.user.request.IRoleCreateRequest#getDescription() */ - @Override public String getDescription() { - return this.description; + @Override + public String getDescription() { + return this.description; } @Override public List getAuthorities() { - return this.authorities; + return this.authorities; } public void setDescription(String description) { - this.description = description; + this.description = description; } public void setAuthorities(List authorities) { - this.authorities = authorities; + this.authorities = authorities; } } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java index 6c88d8e..210f786 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.rest.model.user.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/SiteWhereException.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/SiteWhereException.java index 43ee8bb..0c1fbbb 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/SiteWhereException.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/SiteWhereException.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/SiteWhereSystemException.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/SiteWhereSystemException.java index 3d631a9..711d7cb 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/SiteWhereSystemException.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/SiteWhereSystemException.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IArea.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IArea.java index 35a3f54..aa4be88 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IArea.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IArea.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.area; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IAreaType.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IAreaType.java index 5f8aac3..c522193 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IAreaType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IAreaType.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.area; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IBoundedEntity.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IBoundedEntity.java index 44f9142..27a4227 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IBoundedEntity.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IBoundedEntity.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.area; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IZone.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IZone.java index 2d1551b..11b3179 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IZone.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/IZone.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.area; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IAreaCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IAreaCreateRequest.java index eb5b67f..10aba7a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IAreaCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IAreaCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.area.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IAreaTypeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IAreaTypeCreateRequest.java index 8324df8..ca3fe59 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IAreaTypeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IAreaTypeCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.area.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IZoneCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IZoneCreateRequest.java index 611593e..c5e69dd 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IZoneCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/area/request/IZoneCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.area.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/AssetCategory.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/AssetCategory.java index 77baa35..c2a76a2 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/AssetCategory.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/AssetCategory.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.asset; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/IAsset.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/IAsset.java index 7e23039..49fecfc 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/IAsset.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/IAsset.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.asset; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/IAssetType.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/IAssetType.java index 1440fd3..5d6a8c4 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/IAssetType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/IAssetType.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.asset; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/request/IAssetCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/request/IAssetCreateRequest.java index 3221309..e78fcc9 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/request/IAssetCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/request/IAssetCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.asset.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/request/IAssetTypeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/request/IAssetTypeCreateRequest.java index 87ebcc0..dfc6f7b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/request/IAssetTypeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/asset/request/IAssetTypeCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.asset.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/BatchOperationStatus.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/BatchOperationStatus.java index 6427b25..0938022 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/BatchOperationStatus.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/BatchOperationStatus.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.batch; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/ElementProcessingStatus.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/ElementProcessingStatus.java index 772bf41..e2fad60 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/ElementProcessingStatus.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/ElementProcessingStatus.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.batch; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/IBatchElement.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/IBatchElement.java index f4b1c41..addee4e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/IBatchElement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/IBatchElement.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.batch; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/IBatchOperation.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/IBatchOperation.java index c371c0d..815b20f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/IBatchOperation.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/IBatchOperation.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.batch; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/kafka/IUnprocessedBatchElement.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/kafka/IUnprocessedBatchElement.java index 5cde5cc..42cabe4 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/kafka/IUnprocessedBatchElement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/kafka/IUnprocessedBatchElement.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.batch.kafka; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/kafka/IUnprocessedBatchOperation.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/kafka/IUnprocessedBatchOperation.java index ebb4ff5..49880bf 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/kafka/IUnprocessedBatchOperation.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/kafka/IUnprocessedBatchOperation.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.batch.kafka; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchCommandInvocationRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchCommandInvocationRequest.java index 6721b57..c75cad3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchCommandInvocationRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchCommandInvocationRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.batch.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchElementCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchElementCreateRequest.java index 4e72138..bfa5e41 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchElementCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchElementCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.batch.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchOperationCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchOperationCreateRequest.java index 9ee6eee..4cbc300 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchOperationCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchOperationCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.batch.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchOperationUpdateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchOperationUpdateRequest.java index fe3fece..b6cdd01 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchOperationUpdateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IBatchOperationUpdateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.batch.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IInvocationByAssignmentCriteriaRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IInvocationByAssignmentCriteriaRequest.java index 26c6bdf..d696fa3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IInvocationByAssignmentCriteriaRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IInvocationByAssignmentCriteriaRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.batch.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IInvocationByDeviceCriteriaRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IInvocationByDeviceCriteriaRequest.java index 055867c..9855932 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IInvocationByDeviceCriteriaRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/batch/request/IInvocationByDeviceCriteriaRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.batch.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/command/CommandResult.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/command/CommandResult.java index 1152ceb..8433c89 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/command/CommandResult.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/command/CommandResult.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/command/ICommandResponse.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/command/ICommandResponse.java index dc0455c..9181236 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/command/ICommandResponse.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/command/ICommandResponse.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/Comparators.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/Comparators.java index 59eff77..dc6cec2 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/Comparators.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/Comparators.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.common; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IAccessible.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IAccessible.java index 94658c3..14e26f3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IAccessible.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IAccessible.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.common; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IBrandedEntity.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IBrandedEntity.java index 4ea3732..493bd72 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IBrandedEntity.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IBrandedEntity.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.common; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IBrandedTreeEntity.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IBrandedTreeEntity.java index fed034d..716c3de 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IBrandedTreeEntity.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IBrandedTreeEntity.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.common; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IColorProvider.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IColorProvider.java index 0be4805..0a381d4 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IColorProvider.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IColorProvider.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.common; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IFilter.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IFilter.java index fe19f74..27d2ae0 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IFilter.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IFilter.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.common; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IIconProvider.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IIconProvider.java index 53cc92f..046e8c2 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IIconProvider.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IIconProvider.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.common; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IImageProvider.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IImageProvider.java index 0cfa32e..d3dcbff 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IImageProvider.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IImageProvider.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.common; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/ILocation.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/ILocation.java index 4a40ccb..b0d27bc 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/ILocation.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/ILocation.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.common; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IMetadataProvider.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IMetadataProvider.java index 80c0748..a17e011 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IMetadataProvider.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IMetadataProvider.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.common; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IPersistentEntity.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IPersistentEntity.java index 0330778..4c8bb38 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IPersistentEntity.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/IPersistentEntity.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.common; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/ITreeEntity.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/ITreeEntity.java index 3ea2e16..3ef4f3f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/ITreeEntity.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/ITreeEntity.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.common; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/IBrandedEntityCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/IBrandedEntityCreateRequest.java index e1f4af5..ef55873 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/IBrandedEntityCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/IBrandedEntityCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.common.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/IPersistentEntityCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/IPersistentEntityCreateRequest.java index 6c64700..5f54e6b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/IPersistentEntityCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/IPersistentEntityCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.common.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/ITreeEntityCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/ITreeEntityCreateRequest.java index 4ab39ad..be49c3d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/ITreeEntityCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/common/request/ITreeEntityCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.common.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/ICustomer.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/ICustomer.java index b9ca24b..f5206f7 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/ICustomer.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/ICustomer.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.customer; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/ICustomerType.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/ICustomerType.java index c889b35..103de1e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/ICustomerType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/ICustomerType.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.customer; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/request/ICustomerCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/request/ICustomerCreateRequest.java index 54de50b..3c1dde3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/request/ICustomerCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/request/ICustomerCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.customer.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/request/ICustomerTypeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/request/ICustomerTypeCreateRequest.java index acf5d24..2815a2d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/request/ICustomerTypeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/customer/request/ICustomerTypeCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.customer.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/DeviceAlarmState.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/DeviceAlarmState.java index 639d847..4a8c33b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/DeviceAlarmState.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/DeviceAlarmState.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/DeviceAssignmentStatus.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/DeviceAssignmentStatus.java index d1f6dc5..16e6eb9 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/DeviceAssignmentStatus.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/DeviceAssignmentStatus.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/DeviceContainerPolicy.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/DeviceContainerPolicy.java index e5b1e52..21c00a2 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/DeviceContainerPolicy.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/DeviceContainerPolicy.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDevice.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDevice.java index 38198fc..1500275 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDevice.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDevice.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceActions.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceActions.java index ebe07fa..caddbe2 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceActions.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceActions.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAlarm.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAlarm.java index 18ce15a..2f5ea95 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAlarm.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAlarm.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignment.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignment.java index 3bbd2dc..1c91894 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignment.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignment.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignmentSummary.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignmentSummary.java index 55a87ff..09502ce 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignmentSummary.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceAssignmentSummary.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceElementMapping.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceElementMapping.java index 0d3b787..8e60ffd 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceElementMapping.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceElementMapping.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceNestingContext.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceNestingContext.java index a378697..cd4f355 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceNestingContext.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceNestingContext.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceStatus.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceStatus.java index e374b47..0e16303 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceStatus.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceStatus.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceSummary.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceSummary.java index e31aac1..c86802b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceSummary.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceSummary.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceType.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceType.java index 98495ed..36306e6 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/IDeviceType.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/asset/IDeviceEventWithAsset.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/asset/IDeviceEventWithAsset.java index 77d2ed7..ef07323 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/asset/IDeviceEventWithAsset.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/asset/IDeviceEventWithAsset.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.asset; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/charting/IChartEntry.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/charting/IChartEntry.java index 145ebac..b71b8eb 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/charting/IChartEntry.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/charting/IChartEntry.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.charting; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/charting/IChartSeries.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/charting/IChartSeries.java index 6108771..40e7427 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/charting/IChartSeries.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/charting/IChartSeries.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.charting; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/DeviceMappingResult.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/DeviceMappingResult.java index 989e95b..4d1a516 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/DeviceMappingResult.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/DeviceMappingResult.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/DeviceStreamStatus.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/DeviceStreamStatus.java index f3f84e7..ff91c30 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/DeviceStreamStatus.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/DeviceStreamStatus.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ICommandParameter.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ICommandParameter.java index 2903096..293a958 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ICommandParameter.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ICommandParameter.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommand.java index 22b3733..c8cbd07 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommand.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommandExecution.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommandExecution.java index ad06108..a953581 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommandExecution.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommandExecution.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommandNamespace.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommandNamespace.java index c9e845b..ce96540 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommandNamespace.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceCommandNamespace.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceMappingAckCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceMappingAckCommand.java index fb68e3b..93fa166 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceMappingAckCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceMappingAckCommand.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceStreamAckCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceStreamAckCommand.java index a6f2ec2..b9d02a7 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceStreamAckCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IDeviceStreamAckCommand.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IRegistrationAckCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IRegistrationAckCommand.java index bd15ff1..40bc366 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IRegistrationAckCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IRegistrationAckCommand.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IRegistrationFailureCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IRegistrationFailureCommand.java index 911b7ca..daa6639 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IRegistrationFailureCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/IRegistrationFailureCommand.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ISendDeviceStreamDataCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ISendDeviceStreamDataCommand.java index e85bfb7..f4e58d1 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ISendDeviceStreamDataCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ISendDeviceStreamDataCommand.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ISystemCommand.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ISystemCommand.java index e30a850..d2485c1 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ISystemCommand.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ISystemCommand.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ParameterType.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ParameterType.java index a5e1e4c..f90eabe 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ParameterType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/ParameterType.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/RegistrationFailureReason.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/RegistrationFailureReason.java index 72fb7de..0702db7 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/RegistrationFailureReason.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/RegistrationFailureReason.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/RegistrationSuccessReason.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/RegistrationSuccessReason.java index cb39836..e2518cf 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/RegistrationSuccessReason.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/RegistrationSuccessReason.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/SystemCommandType.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/SystemCommandType.java index 58f0bdc..a057efb 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/SystemCommandType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/command/SystemCommandType.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.command; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceElement.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceElement.java index 2503015..735638a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceElement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceElement.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.element; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceElementSchema.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceElementSchema.java index c968e6e..0d13b8e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceElementSchema.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceElementSchema.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.element; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceSlot.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceSlot.java index 99aa811..986e10e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceSlot.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceSlot.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.element; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceUnit.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceUnit.java index de05937..81209a2 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceUnit.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/element/IDeviceUnit.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.element; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/AlertLevel.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/AlertLevel.java index 3093216..aec53eb 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/AlertLevel.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/AlertLevel.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/AlertSource.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/AlertSource.java index a3e1881..17cb933 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/AlertSource.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/AlertSource.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/CommandInitiator.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/CommandInitiator.java index a26bd6d..f762616 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/CommandInitiator.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/CommandInitiator.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/CommandStatus.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/CommandStatus.java index 94e3cc7..f813205 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/CommandStatus.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/CommandStatus.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/CommandTarget.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/CommandTarget.java index 3c3bc86..b070dad 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/CommandTarget.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/CommandTarget.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/DeviceEventIndex.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/DeviceEventIndex.java index 5a6001f..f76efed 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/DeviceEventIndex.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/DeviceEventIndex.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/DeviceEventType.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/DeviceEventType.java index 6238d3a..cf1407c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/DeviceEventType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/DeviceEventType.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlert.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlert.java index 9bcf46d..23a624c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlert.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlert.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlertContent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlertContent.java index b8d9964..127bd08 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlertContent.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceAlertContent.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceCommandInvocation.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceCommandInvocation.java index 61f55d8..d02030b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceCommandInvocation.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceCommandInvocation.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceCommandResponse.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceCommandResponse.java index 32f63b3..14ede9d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceCommandResponse.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceCommandResponse.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEvent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEvent.java index 1fc5b07..326e68b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEvent.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEvent.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventBatch.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventBatch.java index 9fa3fa0..1603bdf 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventBatch.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventBatch.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventBatchResponse.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventBatchResponse.java index 4b68f17..6d96877 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventBatchResponse.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventBatchResponse.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventContext.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventContext.java index 5495dad..5384ef7 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventContext.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventContext.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventOriginator.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventOriginator.java index f32f8c9..4f05333 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventOriginator.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceEventOriginator.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocation.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocation.java index 0366b5a..9a0e1ca 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocation.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocation.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocationContent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocationContent.java index f86f39d..9ac993f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocationContent.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceLocationContent.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurement.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurement.java index 3c0762c..3192c0a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurement.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementClassifier.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementClassifier.java index be20ba8..e4c2ae1 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementClassifier.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementClassifier.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementContent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementContent.java index e92c95d..cc0b9a1 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementContent.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceMeasurementContent.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceStateChange.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceStateChange.java index f1230ef..78d4249 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceStateChange.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/IDeviceStateChange.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IDecodedEventPayload.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IDecodedEventPayload.java index 2489bc4..fa6557f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IDecodedEventPayload.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IDecodedEventPayload.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event.kafka; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IDeviceRegistrationPayload.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IDeviceRegistrationPayload.java index 0de6360..8ca8cad 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IDeviceRegistrationPayload.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IDeviceRegistrationPayload.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event.kafka; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IPreprocessedEventPayload.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IPreprocessedEventPayload.java index 68a39dd..ba5886c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IPreprocessedEventPayload.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IPreprocessedEventPayload.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event.kafka; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IProcessedEventPayload.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IProcessedEventPayload.java index 7cd31da..03ae11f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IProcessedEventPayload.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/kafka/IProcessedEventPayload.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event.kafka; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceAlertCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceAlertCreateRequest.java index 2695859..7121075 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceAlertCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceAlertCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceAssignmentEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceAssignmentEventCreateRequest.java index cc0b527..2eb06ff 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceAssignmentEventCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceAssignmentEventCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceCommandInvocationCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceCommandInvocationCreateRequest.java index 6a575fb..96beda2 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceCommandInvocationCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceCommandInvocationCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceCommandResponseCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceCommandResponseCreateRequest.java index 62beee3..d5fb7ff 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceCommandResponseCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceCommandResponseCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceEventCreateRequest.java index c44f2ad..20fcda6 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceEventCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceEventCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceLocationCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceLocationCreateRequest.java index f7746ed..9c47afb 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceLocationCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceLocationCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceMeasurementCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceMeasurementCreateRequest.java index 28a8083..e7799af 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceMeasurementCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceMeasurementCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceRegistrationRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceRegistrationRequest.java index 8ec1232..236bf30 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceRegistrationRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceRegistrationRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceStateChangeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceStateChangeCreateRequest.java index 2bbe8b0..ff99019 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceStateChangeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceStateChangeCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceStreamCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceStreamCreateRequest.java index 4fd82ea..07b11d1 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceStreamCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceStreamCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/ISendDeviceStreamDataRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/ISendDeviceStreamDataRequest.java index 4062888..0239b22 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/ISendDeviceStreamDataRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/ISendDeviceStreamDataRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/state/PresenceState.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/state/PresenceState.java index c6d5b60..4d92d38 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/state/PresenceState.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/state/PresenceState.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event.state; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/state/RegistrationState.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/state/RegistrationState.java index bea9b57..2002702 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/state/RegistrationState.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/state/RegistrationState.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event.state; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/streaming/IEventStreamAck.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/streaming/IEventStreamAck.java index 1f349a0..6acb650 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/streaming/IEventStreamAck.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/streaming/IEventStreamAck.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.event.streaming; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroup.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroup.java index 2719ce1..be45f42 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroup.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroup.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.group; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroupElement.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroupElement.java index 1a7fcc6..1c62e35 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroupElement.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/group/IDeviceGroupElement.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.group; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAlarmCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAlarmCreateRequest.java index 066440a..12742fd 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAlarmCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAlarmCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAssignmentBulkRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAssignmentBulkRequest.java index 6020a19..2b677f5 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAssignmentBulkRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAssignmentBulkRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAssignmentCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAssignmentCreateRequest.java index c91bd39..6dd007c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAssignmentCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceAssignmentCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceCommandCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceCommandCreateRequest.java index 35f2b93..c34ba63 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceCommandCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceCommandCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceCreateRequest.java index 3b67ef2..6aab3ca 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupCreateRequest.java index 379de7b..c5ee9c6 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupElementCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupElementCreateRequest.java index 7ebfc7b..a406774 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupElementCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceGroupElementCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceStatusCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceStatusCreateRequest.java index ba04479..cbe186b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceStatusCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceStatusCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceTypeCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceTypeCreateRequest.java index 04328b2..9355ca6 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceTypeCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/request/IDeviceTypeCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IDeviceState.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IDeviceState.java index 6feb78e..99b23b9 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IDeviceState.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IDeviceState.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.state; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentAlertEvent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentAlertEvent.java index 047f5a9..8472635 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentAlertEvent.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentAlertEvent.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.state; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentLocationEvent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentLocationEvent.java index 2e11a22..ff5d91c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentLocationEvent.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentLocationEvent.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.state; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentMeasurementEvent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentMeasurementEvent.java index 5b5fc16..49ea52a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentMeasurementEvent.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentMeasurementEvent.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.state; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentStateEvent.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentStateEvent.java index a855d8b..6bdc032 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentStateEvent.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/IRecentStateEvent.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.state; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateCreateRequest.java index 02075dc..2d6b571 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.state.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateEventMergeRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateEventMergeRequest.java index 0edb03d..47199ff 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateEventMergeRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IDeviceStateEventMergeRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.state.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentLocationEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentLocationEventCreateRequest.java index 5806c16..62d518a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentLocationEventCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentLocationEventCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.state.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentMeasurementEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentMeasurementEventCreateRequest.java index cd32f50..0415a4a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentMeasurementEventCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentMeasurementEventCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.state.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentStateEventCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentStateEventCreateRequest.java index d6f217e..bc88962 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentStateEventCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/state/request/IRecentStateEventCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.state.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/IDeviceStream.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/IDeviceStream.java index 391fca5..cec7c4c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/IDeviceStream.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/IDeviceStream.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.streaming; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/IDeviceStreamData.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/IDeviceStreamData.java index acd6805..63e055b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/IDeviceStreamData.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/IDeviceStreamData.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.streaming; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/request/IDeviceStreamDataCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/request/IDeviceStreamDataCreateRequest.java index 05be5f9..3d5f086 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/request/IDeviceStreamDataCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/streaming/request/IDeviceStreamDataCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.streaming.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/util/DeviceTypeUtils.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/util/DeviceTypeUtils.java index d14bead..ef8e7c3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/util/DeviceTypeUtils.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/util/DeviceTypeUtils.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.util; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/util/DeviceUtils.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/util/DeviceUtils.java index 231911b..ef6f894 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/util/DeviceUtils.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/util/DeviceUtils.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.device.util; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/error/ErrorCode.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/error/ErrorCode.java index 024c9d6..cc16275 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/error/ErrorCode.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/error/ErrorCode.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.error; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/error/ErrorLevel.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/error/ErrorLevel.java index 6cf08fb..ae0c6ff 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/error/ErrorLevel.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/error/ErrorLevel.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.error; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/error/ResourceExistsException.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/error/ResourceExistsException.java index 63d08e3..641d52e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/error/ResourceExistsException.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/error/ResourceExistsException.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.error; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/IZoneMatcher.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/IZoneMatcher.java index 97b1ff4..4e8b660 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/IZoneMatcher.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/IZoneMatcher.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.geospatial; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/IZoneRelationship.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/IZoneRelationship.java index 3526fb9..e1ab7de 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/IZoneRelationship.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/IZoneRelationship.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.geospatial; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/ZoneContainment.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/ZoneContainment.java index 65fce9e..e025995 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/ZoneContainment.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/geospatial/ZoneContainment.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.geospatial; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/label/ILabel.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/label/ILabel.java index 6768153..b7e17a2 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/label/ILabel.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/label/ILabel.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.label; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/microservice/IMicroserviceSummary.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/microservice/IMicroserviceSummary.java index e94791c..9479883 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/microservice/IMicroserviceSummary.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/microservice/IMicroserviceSummary.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.microservice; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/ISchedule.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/ISchedule.java index 0a5466b..6446921 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/ISchedule.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/ISchedule.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.scheduling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/IScheduledJob.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/IScheduledJob.java index dcac7a6..b75fd80 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/IScheduledJob.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/IScheduledJob.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.scheduling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/JobConstants.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/JobConstants.java index 4591888..05baf08 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/JobConstants.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/JobConstants.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.scheduling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/ScheduledJobState.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/ScheduledJobState.java index 0668078..5d19dc9 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/ScheduledJobState.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/ScheduledJobState.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.scheduling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/ScheduledJobType.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/ScheduledJobType.java index d60a715..6f54a3c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/ScheduledJobType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/ScheduledJobType.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.scheduling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/TriggerConstants.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/TriggerConstants.java index c187e73..619232d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/TriggerConstants.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/TriggerConstants.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.scheduling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/TriggerType.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/TriggerType.java index 2989fe0..d5cb58e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/TriggerType.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/TriggerType.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.scheduling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/request/IScheduleCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/request/IScheduleCreateRequest.java index 4854f47..89b8336 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/request/IScheduleCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/request/IScheduleCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.scheduling.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/request/IScheduledJobCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/request/IScheduledJobCreateRequest.java index f146bf6..b277e11 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/request/IScheduledJobCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/scheduling/request/IScheduledJobCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.scheduling.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/IDateRangeSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/IDateRangeSearchCriteria.java index ad8af5b..49f9ff1 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/IDateRangeSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/IDateRangeSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ISearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ISearchCriteria.java index 4138bcc..a390174 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ISearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ISearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ISearchResults.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ISearchResults.java index 223ee77..663e0dc 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ISearchResults.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ISearchResults.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ITreeNode.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ITreeNode.java index 724ee42..3675e44 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ITreeNode.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/ITreeNode.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaResponseFormat.java index 4c47772..a274dde 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.area; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaSearchCriteria.java index c12f02d..5f530cf 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.area; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaTypeSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaTypeSearchCriteria.java index b072640..754a4bf 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaTypeSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/area/IAreaTypeSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.area; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/asset/IAssetSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/asset/IAssetSearchCriteria.java index 53b2601..e1821b8 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/asset/IAssetSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/asset/IAssetSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.asset; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/asset/IAssetTypeSearchCritiera.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/asset/IAssetTypeSearchCritiera.java index 9d405e0..34e950f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/asset/IAssetTypeSearchCritiera.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/asset/IAssetTypeSearchCritiera.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.asset; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/batch/IBatchOperationSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/batch/IBatchOperationSearchCriteria.java index a682d2c..1865a54 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/batch/IBatchOperationSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/batch/IBatchOperationSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.batch; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerResponseFormat.java index a96a03a..c285e58 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.customer; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerSearchCriteria.java index a0366f2..82312e4 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.customer; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerTypeResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerTypeResponseFormat.java index a780f8f..48b3a25 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerTypeResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerTypeResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.customer; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerTypeSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerTypeSearchCriteria.java index de5a016..76e1530 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerTypeSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/customer/ICustomerTypeSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.customer; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IBatchElementSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IBatchElementSearchCriteria.java index 0abff4b..5142112 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IBatchElementSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IBatchElementSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAlarmSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAlarmSearchCriteria.java index 8dfe357..4fe74e9 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAlarmSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAlarmSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAssignmentResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAssignmentResponseFormat.java index f943372..9ab0209 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAssignmentResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAssignmentResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAssignmentSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAssignmentSearchCriteria.java index f37c505..35650dc 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAssignmentSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceAssignmentSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceByGroupResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceByGroupResponseFormat.java index 7f0b50b..8daed13 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceByGroupResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceByGroupResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceCommandSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceCommandSearchCriteria.java index 391daf6..8866ffe 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceCommandSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceCommandSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupElementResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupElementResponseFormat.java index 8ca6058..62f3e02 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupElementResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupElementResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupElementSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupElementSearchCriteria.java index d350489..7910b8b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupElementSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupElementSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupSearchCriteria.java index 56afaf3..7cc9981 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceGroupSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceResponseFormat.java index c4df19c..7091bb8 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceSearchCriteria.java index 9d96e6c..74a31e3 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateResponseFormat.java index 8b3f671..f6ba589 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateSearchCriteria.java index 67f41b1..f28c87d 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStateSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStatusSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStatusSearchCriteria.java index 0f91ff4..6fb6424 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStatusSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceStatusSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceTypeResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceTypeResponseFormat.java index 22fb94a..ba29e0c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceTypeResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceTypeResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceTypeSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceTypeSearchCriteria.java index 29ae59c..582918e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceTypeSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IDeviceTypeSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IRecentStateEventSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IRecentStateEventSearchCriteria.java index 45911d1..163b2ba 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IRecentStateEventSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IRecentStateEventSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IZoneSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IZoneSearchCriteria.java index f2dc969..92f93ad 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IZoneSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/device/IZoneSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.device; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduleResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduleResponseFormat.java index e7e3d9a..ccbad7e 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduleResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduleResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.scheduling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduleSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduleSearchCriteria.java index 750e71e..93eb711 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduleSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduleSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.scheduling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduledJobResponseFormat.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduledJobResponseFormat.java index 557192e..f505fee 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduledJobResponseFormat.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduledJobResponseFormat.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.scheduling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduledJobSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduledJobSearchCriteria.java index b323268..87fe800 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduledJobSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/scheduling/IScheduledJobSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.scheduling; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/tenant/ITenantSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/tenant/ITenantSearchCriteria.java index 77adb09..c9d3805 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/tenant/ITenantSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/search/tenant/ITenantSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.search.tenant; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/system/IVersion.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/system/IVersion.java index e078868..8259bbc 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/system/IVersion.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/system/IVersion.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.system; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenant.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenant.java index 02204e4..4bc7e74 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenant.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenant.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.tenant; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/TenantNotAvailableException.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/TenantNotAvailableException.java index 5aa7b1a..3e9f42c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/TenantNotAvailableException.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/TenantNotAvailableException.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.tenant; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/request/ITenantCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/request/ITenantCreateRequest.java index d315623..fb8d134 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/request/ITenantCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/request/ITenantCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.tenant.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/AccountStatus.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/AccountStatus.java index 538e886..18ec739 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/AccountStatus.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/AccountStatus.java @@ -1,9 +1,17 @@ /* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com + * Copyright © 2014-2020 The SiteWhere Authors * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.user; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IGrantedAuthority.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IGrantedAuthority.java index 8fe9686..1e7ee98 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IGrantedAuthority.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IGrantedAuthority.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.user; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IGrantedAuthoritySearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IGrantedAuthoritySearchCriteria.java index 5cf88ae..3271ddb 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IGrantedAuthoritySearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IGrantedAuthoritySearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.user; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRole.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRole.java index d764822..45b90f6 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRole.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRole.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.user; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRoleSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRoleSearchCriteria.java index ca5e1c9..26e75d6 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRoleSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IRoleSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.user; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java index 8a902bf..8997501 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.user; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUserSearchCriteria.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUserSearchCriteria.java index e384ec2..8788d88 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUserSearchCriteria.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUserSearchCriteria.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.user; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereAuthority.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereAuthority.java index a9dd201..a093ac2 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereAuthority.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereAuthority.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.user; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java index bb7cdc7..a9f9b5a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.user; @@ -12,48 +20,53 @@ import java.util.stream.Collectors; public enum SiteWhereRole { - REST("ROLE_REST","REST services access", Arrays.asList(SiteWhereAuthority.REST)), - ADMIN_CONSOLE("ROLE_ADMIN_CONSOLE","Administrative console login",Arrays.asList(SiteWhereAuthority.AdminConsole)), - VIEW_SERVER_INFO("ROLE_VIEW_SERVER_INFO","View global server information", Arrays.asList(SiteWhereAuthority.ViewServerInfo)), - ADMINISTER_USERS("ROLE_ADMINISTER_USERS","Administer all users",Arrays.asList(SiteWhereAuthority.AdminUsers)), - ADMINISTER_USER_SELF("ROLE_ADMINISTER_USER_SELF","Administer own user profile",Arrays.asList(SiteWhereAuthority.AdminSelf)), - ADMINISTER_TENANTS("ROLE_ADMINISTER_TENANTS","Administer all tenants",Arrays.asList(SiteWhereAuthority.AdminTenants)), - ADMINISTER_TENANT_SELF("ROLE_ADMINISTER_TENANT_SELF","Administer own tenant",Arrays.asList(SiteWhereAuthority.AdminOwnTenant)); + REST("ROLE_REST", "REST services access", Arrays.asList(SiteWhereAuthority.REST)), ADMIN_CONSOLE( + "ROLE_ADMIN_CONSOLE", "Administrative console login", + Arrays.asList(SiteWhereAuthority.AdminConsole)), VIEW_SERVER_INFO("ROLE_VIEW_SERVER_INFO", + "View global server information", + Arrays.asList(SiteWhereAuthority.ViewServerInfo)), ADMINISTER_USERS("ROLE_ADMINISTER_USERS", + "Administer all users", Arrays.asList(SiteWhereAuthority.AdminUsers)), ADMINISTER_USER_SELF( + "ROLE_ADMINISTER_USER_SELF", "Administer own user profile", + Arrays.asList(SiteWhereAuthority.AdminSelf)), ADMINISTER_TENANTS( + "ROLE_ADMINISTER_TENANTS", "Administer all tenants", + Arrays.asList(SiteWhereAuthority.AdminTenants)), ADMINISTER_TENANT_SELF( + "ROLE_ADMINISTER_TENANT_SELF", "Administer own tenant", + Arrays.asList(SiteWhereAuthority.AdminOwnTenant)); private String roleName; private String description; private List authorities; public String getRoleName() { - return roleName; + return roleName; } public String getDescription() { - return description; + return description; } public List getAuthoritiesAsStringList() { - List authorities = this.authorities.stream().map(auth -> auth.getName()).collect(Collectors.toList()); - return authorities; + List authorities = this.authorities.stream().map(auth -> auth.getName()).collect(Collectors.toList()); + return authorities; } public List getAuthorities() { - return authorities; + return authorities; } SiteWhereRole(final String roleName, String description, final List authorities) { - this.roleName = roleName; - this.description = description; - this.authorities = authorities; + this.roleName = roleName; + this.description = description; + this.authorities = authorities; } - public static List getAuthoritiesByRoleName(String roleName){ - for(SiteWhereRole v : values()){ - if( v.getRoleName().equalsIgnoreCase(roleName)){ - return v.getAuthorities(); - } - } + public static List getAuthoritiesByRoleName(String roleName) { + for (SiteWhereRole v : values()) { + if (v.getRoleName().equalsIgnoreCase(roleName)) { + return v.getAuthorities(); + } + } - throw new IllegalStateException(String.format("Unsupported role %s.", roleName)); + throw new IllegalStateException(String.format("Unsupported role %s.", roleName)); } } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRoles.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRoles.java index d71fd1e..1ce8a20 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRoles.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRoles.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.user; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IGrantedAuthorityCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IGrantedAuthorityCreateRequest.java index f10bb46..c036b2f 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IGrantedAuthorityCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IGrantedAuthorityCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.user.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IRoleCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IRoleCreateRequest.java index c12bfa3..89c15a8 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IRoleCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IRoleCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.user.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java index 5b8e280..11b7bb5 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.user.request; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/web/ISiteWhereWebConstants.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/web/ISiteWhereWebConstants.java index 3b4d5b4..296ac55 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/web/ISiteWhereWebConstants.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/web/ISiteWhereWebConstants.java @@ -1,9 +1,17 @@ -/* - * Copyright (c) SiteWhere, LLC. All rights reserved. http://www.sitewhere.com +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 * - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. + * 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 com.sitewhere.spi.web; From 2f3dfac42ce0e69b0f700f5875384f0f73527496 Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Mon, 14 Sep 2020 12:59:15 -0400 Subject: [PATCH 41/48] fix: Add header. --- HEADER | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/HEADER b/HEADER index 4c73186..94a6255 100644 --- a/HEADER +++ b/HEADER @@ -1,3 +1,15 @@ /** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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. */ - \ No newline at end of file From 0768e989fe6544e65eb3ecabed77362d8fef283f Mon Sep 17 00:00:00 2001 From: jorgevillaverde-sitewhere Date: Thu, 15 Oct 2020 12:38:35 -0300 Subject: [PATCH 42/48] feat: add asset token to device registration. Refs: sitewhere/sitewhere#892 --- build.gradle | 2 +- .../event/request/DeviceRegistrationRequest.java | 16 ++++++++++++++++ .../request/IDeviceRegistrationRequest.java | 7 +++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9e393c1..7c5810f 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.beta12' + version = '3.0.0.beta13' repositories { maven { url "https://repo.maven.apache.org/maven2" } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceRegistrationRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceRegistrationRequest.java index 241a6df..2fc9e6c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceRegistrationRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/device/event/request/DeviceRegistrationRequest.java @@ -35,6 +35,9 @@ public class DeviceRegistrationRequest extends DeviceCreateRequest implements ID /** Area token */ private String areaToken; + /** Asset token */ + private String assetToken; + /* * @see com.sitewhere.spi.device.event.request.IDeviceRegistrationRequest# * getCustomerToken() @@ -60,4 +63,17 @@ public String getAreaToken() { public void setAreaToken(String areaToken) { this.areaToken = areaToken; } + + /* + * @see com.sitewhere.spi.device.event.request.IDeviceRegistrationRequest# + * getAssetToken() + */ + @Override + public String getAssetToken() { + return assetToken; + } + + public void setAssetToken(String assetToken) { + this.assetToken = assetToken; + } } \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceRegistrationRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceRegistrationRequest.java index 236bf30..5e74990 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceRegistrationRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/device/event/request/IDeviceRegistrationRequest.java @@ -35,4 +35,11 @@ public interface IDeviceRegistrationRequest extends IDeviceCreateRequest { * @return */ String getAreaToken(); + + /** + * Get token for the asset to which device should be assigned. + * + * @return + */ + String getAssetToken(); } \ No newline at end of file From 4edf80e0e43fda0be8eac105fc669310b76a2910 Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Tue, 24 Nov 2020 12:57:04 -0500 Subject: [PATCH 43/48] fix: Update user model for Keycloak support. --- build.gradle | 2 +- .../com/sitewhere/rest/model/user/User.java | 42 +++++++++---------- .../model/user/request/UserCreateRequest.java | 16 ++++++- .../java/com/sitewhere/spi/user/IUser.java | 14 +++---- .../spi/user/request/IUserCreateRequest.java | 7 ++++ 5 files changed, 51 insertions(+), 30 deletions(-) diff --git a/build.gradle b/build.gradle index 7c5810f..2d5c9ac 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.beta13' + version = '3.0.0.beta14' repositories { maven { url "https://repo.maven.apache.org/maven2" } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java index c2b9120..ba1094c 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java @@ -15,6 +15,11 @@ */ package com.sitewhere.rest.model.user; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; @@ -25,11 +30,6 @@ import com.sitewhere.spi.user.IRole; import com.sitewhere.spi.user.IUser; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - /** * Model class for a User. */ @@ -42,15 +42,15 @@ public class User extends PersistentEntity implements IUser { /** Unique username */ private String username; - /** Hashed password */ - private String hashedPassword; - /** First name */ private String firstName; /** Last name */ private String lastName; + /** Email address */ + private String email; + /** Last login */ private Date lastLogin; @@ -73,18 +73,6 @@ public void setUsername(String username) { this.username = username; } - /* - * @see com.sitewhere.spi.user.IUser#getHashedPassword() - */ - @Override - public String getHashedPassword() { - return hashedPassword; - } - - public void setHashedPassword(String hashedPassword) { - this.hashedPassword = hashedPassword; - } - /* * @see com.sitewhere.spi.user.IUser#getFirstName() */ @@ -109,6 +97,18 @@ public void setLastName(String lastName) { this.lastName = lastName; } + /* + * @see com.sitewhere.spi.user.IUser#getEmail() + */ + @Override + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + /* * @see com.sitewhere.spi.user.IUser#getLastLogin() */ @@ -155,9 +155,9 @@ public void setRoles(List roles) { public static User copy(IUser input) throws SiteWhereException { User result = new User(); result.setUsername(input.getUsername()); - result.setHashedPassword(input.getHashedPassword()); result.setFirstName(input.getFirstName()); result.setLastName(input.getLastName()); + result.setEmail(input.getEmail()); result.setLastLogin(input.getLastLogin()); result.setStatus(input.getStatus()); result.setRoles(new ArrayList<>(input.getRoles())); diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java index 210f786..8154e38 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java @@ -51,6 +51,9 @@ public class UserCreateRequest extends PersistentEntityCreateRequest implements /** User lastname */ private String lastName; + /** User email */ + private String email; + /** User status */ private AccountStatus status; @@ -105,6 +108,18 @@ public void setLastName(String lastName) { this.lastName = lastName; } + /* + * @see com.sitewhere.spi.user.request.IUserCreateRequest#getEmail() + */ + @Override + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + /* * @see com.sitewhere.spi.user.request.IUserCreateRequest#getStatus() */ @@ -143,7 +158,6 @@ public Builder(String username, String password, String firstName, String lastNa public Builder(IUser existing) { request.setUsername(existing.getUsername()); - request.setPassword(existing.getHashedPassword()); request.setFirstName(existing.getFirstName()); request.setLastName(existing.getLastName()); request.setStatus(existing.getStatus()); diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java index 8997501..e2a30b6 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java @@ -32,13 +32,6 @@ public interface IUser extends IPersistentEntity { */ String getUsername(); - /** - * Get the password. - * - * @return - */ - String getHashedPassword(); - /** * Get the common name. * @@ -53,6 +46,13 @@ public interface IUser extends IPersistentEntity { */ String getLastName(); + /** + * Email address. + * + * @return + */ + String getEmail(); + /** * Get the last login date. * diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java index 11b7bb5..635f3c2 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java @@ -53,6 +53,13 @@ public interface IUserCreateRequest extends IPersistentEntityCreateRequest { */ String getLastName(); + /** + * Get email address. + * + * @return + */ + String getEmail(); + /** * Get the account status. * From a42f180230cd7ddc9550e893a24be3375e8d3de1 Mon Sep 17 00:00:00 2001 From: jorgevillaverde-sitewhere Date: Wed, 25 Nov 2020 11:33:44 -0300 Subject: [PATCH 44/48] chore: bump version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2d5c9ac..9d6aead 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.beta14' + version = '3.0.0.beta15' repositories { maven { url "https://repo.maven.apache.org/maven2" } From 6c5392e93ddd26cb4d64d16f1c7db90c3e61653c Mon Sep 17 00:00:00 2001 From: jorgevillaverde-sitewhere Date: Wed, 25 Nov 2020 11:57:38 -0300 Subject: [PATCH 45/48] feat: add mission tenant API calls. - listTenantConfigurationTemplates - listTenantDatasetTemplates --- .../rest/client/SiteWhereClient.java | 34 + .../rest/client/SiteWhereRestRetrofit.java | 10 +- .../com/sitewhere/spi/ISiteWhereClient.java | 793 +++++++----------- .../tenant/TenantConfigurationTemplate.java | 65 ++ .../model/tenant/TenantDatasetTemplate.java | 65 ++ .../tenant/ITenantConfigurationTemplate.java | 43 + .../spi/tenant/ITenantDatasetTemplate.java | 44 + 7 files changed, 585 insertions(+), 469 deletions(-) create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/TenantConfigurationTemplate.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/TenantDatasetTemplate.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenantConfigurationTemplate.java create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenantDatasetTemplate.java diff --git a/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereClient.java b/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereClient.java index fd14ddc..2f76cbe 100644 --- a/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereClient.java +++ b/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereClient.java @@ -134,6 +134,8 @@ import com.sitewhere.spi.ISiteWhereClient; import com.sitewhere.spi.ITenantAuthentication; import com.sitewhere.spi.SiteWhereException; +import com.sitewhere.spi.tenant.ITenantConfigurationTemplate; +import com.sitewhere.spi.tenant.ITenantDatasetTemplate; import com.sitewhere.spi.web.ISiteWhereWebConstants; import okhttp3.Headers; @@ -929,6 +931,7 @@ public SearchResults listCommandResponsesForDevi * @see * com.sitewhere.spi.ISiteWhereClient#createCommandResponseForDeviceAssignment() */ + @Override public DeviceCommandResponseWithAsset createCommandResponseForDeviceAssignment(ITenantAuthentication tenant, String token, DeviceCommandResponseCreateRequest request) throws SiteWhereException { Call call = getRestRetrofit().createCommandResponseForDeviceAssignment(token, @@ -956,6 +959,7 @@ token, toISO8601(searchCriteria.getStartDate()), toISO8601(searchCriteria.getEnd * @see * com.sitewhere.spi.ISiteWhereClient#createStateChangeForDeviceAssignment() */ + @Override public DeviceStateChangeWithAsset createStateChangeForDeviceAssignment(ITenantAuthentication tenant, String token, DeviceStateChangeCreateRequest request) throws SiteWhereException { Call call = getRestRetrofit().createStateChangeForDeviceAssignment(token, request, @@ -968,6 +972,7 @@ public DeviceStateChangeWithAsset createStateChangeForDeviceAssignment(ITenantAu * * @see com.sitewhere.spi.ISiteWhereClient#bulkListAlertsForDeviceAssignments() */ + @Override public SearchResults bulkListAlertsForDeviceAssignments(ITenantAuthentication tenant, DeviceAssignmentBulkRequest request) throws SiteWhereException { Call> call = getRestRetrofit().bulkListAlertsForDeviceAssignments(request, @@ -981,6 +986,7 @@ public SearchResults bulkListAlertsForDeviceAssignments(IT * @see com.sitewhere.spi.ISiteWhereClient# * bulkListCommandInvocationsForDeviceAssignments() */ + @Override public SearchResults bulkListCommandInvocationsForDeviceAssignments( ITenantAuthentication tenant, DeviceAssignmentBulkRequest request) throws SiteWhereException { Call> call = getRestRetrofit() @@ -994,6 +1000,7 @@ public SearchResults bulkListCommandInvocationsForDevic * @see com.sitewhere.spi.ISiteWhereClient# * bulkListLocationsForDeviceAssignments() */ + @Override public SearchResults bulkListLocationsForDeviceAssignments(ITenantAuthentication tenant, DeviceAssignmentBulkRequest request) throws SiteWhereException { Call> call = getRestRetrofit() @@ -1007,6 +1014,7 @@ public SearchResults bulkListLocationsForDeviceAssignme * @see com.sitewhere.spi.ISiteWhereClient# * bulkListCommandInvocationsForDeviceAssignments() */ + @Override public SearchResults bulkListMeasurementsForDeviceAssignments( ITenantAuthentication tenant, DeviceAssignmentBulkRequest request) throws SiteWhereException { Call> call = getRestRetrofit() @@ -1020,6 +1028,7 @@ public SearchResults bulkListMeasurementsForDeviceAs * @see com.sitewhere.spi.ISiteWhereClient# * bulkListMeasurementsForDeviceAssignmentsAsChartSeries() */ + @Override public Map>> bulkListMeasurementsForDeviceAssignmentsAsChartSeries( ITenantAuthentication tenant, DeviceAssignmentBulkRequest request) throws SiteWhereException { Call>>> call = getRestRetrofit() @@ -1033,6 +1042,7 @@ public Map>> bulkListMeasurementsForDeviceAssig * @see com.sitewhere.spi.ISiteWhereClient# * bulkListCommandResponsesForDeviceAssignments() */ + @Override public SearchResults bulkListCommandResponsesForDeviceAssignments( ITenantAuthentication tenant, DeviceAssignmentBulkRequest request) throws SiteWhereException { Call> call = getRestRetrofit() @@ -1046,6 +1056,7 @@ public SearchResults bulkListCommandResponsesFor * @see com.sitewhere.spi.ISiteWhereClient# * bulkListStateChangesForDeviceAssignments() */ + @Override public SearchResults bulkListStateChangesForDeviceAssignments( ITenantAuthentication tenant, DeviceAssignmentBulkRequest request) throws SiteWhereException { Call> call = getRestRetrofit() @@ -1062,6 +1073,7 @@ public SearchResults bulkListStateChangesForDeviceAs * * @see com.sitewhere.spi.ISiteWhereClient#listAuthorities() */ + @Override public SearchResults listAuthorities(ITenantAuthentication tenant) throws SiteWhereException { Call> call = getRestRetrofit().listAuthorities(createHeadersFor(tenant)); return processRestCall(call); @@ -1072,6 +1084,7 @@ public SearchResults listAuthorities(ITenantAuthentication ten * * @see com.sitewhere.spi.ISiteWhereClient#getAuthorityByName() */ + @Override public GrantedAuthority getAuthorityByName(ITenantAuthentication tenant, String name) throws SiteWhereException { Call call = getRestRetrofit().getAuthorityByName(name, createHeadersFor(tenant)); return processRestCall(call); @@ -1082,6 +1095,7 @@ public GrantedAuthority getAuthorityByName(ITenantAuthentication tenant, String * * @see com.sitewhere.spi.ISiteWhereClient#createAuthority() */ + @Override public GrantedAuthority createAuthority(ITenantAuthentication tenant, GrantedAuthorityCreateRequest request) throws SiteWhereException { Call call = getRestRetrofit().createAuthority(request, createHeadersFor(tenant)); @@ -1093,6 +1107,7 @@ public GrantedAuthority createAuthority(ITenantAuthentication tenant, GrantedAut * * @see com.sitewhere.spi.ISiteWhereClient#getAuthoritiesHierarchy() */ + @Override public List getAuthoritiesHierarchy(ITenantAuthentication tenant) throws SiteWhereException { Call> call = getRestRetrofit() @@ -2273,6 +2288,25 @@ public Tenant getTenantByToken(String tenantToken) throws SiteWhereException { return processRestCall(call); } + /* + * @see com.sitewhere.spi.ISiteWhereClient#listTenantConfigurationTemplates() + */ + @Override + public List listTenantConfigurationTemplates() throws SiteWhereException { + Call> call = getRestRetrofit() + .listTenantConfigurationTemplates(createDefaulHeaders()); + return processRestCall(call); + } + + /* + * @see com.sitewhere.spi.ISiteWhereClient#listTenantDatasetTemplates() + */ + @Override + public List listTenantDatasetTemplates() throws SiteWhereException { + Call> call = getRestRetrofit().listTenantDatasetTemplates(createDefaulHeaders()); + return processRestCall(call); + } + /* * @see com.sitewhere.spi.ISiteWhereClient#createTenant() */ diff --git a/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereRestRetrofit.java b/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereRestRetrofit.java index df252d7..ea3596e 100644 --- a/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereRestRetrofit.java +++ b/sitewhere-java-client/src/main/java/com/sitewhere/rest/client/SiteWhereRestRetrofit.java @@ -31,8 +31,8 @@ import com.sitewhere.rest.model.asset.request.AssetTypeCreateRequest; import com.sitewhere.rest.model.batch.BatchElement; import com.sitewhere.rest.model.batch.BatchOperation; -import com.sitewhere.rest.model.batch.request.InvocationByDeviceCriteriaRequest; import com.sitewhere.rest.model.batch.request.BatchCommandInvocationRequest; +import com.sitewhere.rest.model.batch.request.InvocationByDeviceCriteriaRequest; import com.sitewhere.rest.model.customer.Customer; import com.sitewhere.rest.model.customer.CustomerType; import com.sitewhere.rest.model.customer.request.CustomerCreateRequest; @@ -92,6 +92,8 @@ import com.sitewhere.rest.model.user.User; import com.sitewhere.rest.model.user.request.GrantedAuthorityCreateRequest; import com.sitewhere.rest.model.user.request.UserCreateRequest; +import com.sitewhere.spi.tenant.ITenantConfigurationTemplate; +import com.sitewhere.spi.tenant.ITenantDatasetTemplate; import okhttp3.ResponseBody; import retrofit2.Call; @@ -838,6 +840,12 @@ Call> listTenants(@Query("authUserId") String authUserId, @Query("textSearch") String textSearch, @Query("includeRuntimeInfo") Boolean includeRuntimeInfo, @Query("page") Integer page, @Query("pageSize") Integer pageSize, @HeaderMap Map headers); + @GET("tenants/templates/configuration") + Call> listTenantConfigurationTemplates(@HeaderMap Map headers); + + @GET("tenants/templates/dataset") + Call> listTenantDatasetTemplates(@HeaderMap Map headers); + @GET("tenants/{tenantToken}") Call getTenantByToken(@Path("tenantToken") String tenantToken, @HeaderMap Map headers); diff --git a/sitewhere-java-client/src/main/java/com/sitewhere/spi/ISiteWhereClient.java b/sitewhere-java-client/src/main/java/com/sitewhere/spi/ISiteWhereClient.java index 7d68dff..1cb5145 100644 --- a/sitewhere-java-client/src/main/java/com/sitewhere/spi/ISiteWhereClient.java +++ b/sitewhere-java-client/src/main/java/com/sitewhere/spi/ISiteWhereClient.java @@ -123,6 +123,8 @@ import com.sitewhere.rest.model.user.User; import com.sitewhere.rest.model.user.request.GrantedAuthorityCreateRequest; import com.sitewhere.rest.model.user.request.UserCreateRequest; +import com.sitewhere.spi.tenant.ITenantConfigurationTemplate; +import com.sitewhere.spi.tenant.ITenantDatasetTemplate; /** * Interface for SiteWhere client calls. @@ -144,12 +146,10 @@ public interface ISiteWhereClient { /** * List area types matching criteria. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. - * @param searchCriteria - * Search criteria object used for filtering Area Type - * results. + * @param tenant Tenant authentication information. Tenant + * authentication information. + * @param searchCriteria Search criteria object used for filtering Area Type + * results. * @return SearchResuts object containing area type matching the * criteria provided. * @throws SiteWhereException @@ -160,9 +160,8 @@ SearchResults listAreaTypes(ITenantAuthentication tenant, AreaTypeSear /** * Get a area type by token. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param areaTypeToken * @return * @throws SiteWhereException @@ -172,9 +171,8 @@ SearchResults listAreaTypes(ITenantAuthentication tenant, AreaTypeSear /** * Create a new area type. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -184,9 +182,8 @@ SearchResults listAreaTypes(ITenantAuthentication tenant, AreaTypeSear /** * Update an existing area type. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param areaTypeToken * @param request * @return @@ -198,9 +195,8 @@ AreaType updateAreaType(ITenantAuthentication tenant, String areaTypeToken, Area /** * Delete an existing area type. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param areaTypeToken * @return * @throws SiteWhereException @@ -210,9 +206,8 @@ AreaType updateAreaType(ITenantAuthentication tenant, String areaTypeToken, Area /** * Get label for area type. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param areaTypeToken * @param generatorId * @return @@ -228,9 +223,8 @@ byte[] getLabelForAreaType(ITenantAuthentication tenant, String areaTypeToken, S /** * List areas matching criteria. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return @@ -242,9 +236,8 @@ SearchResults listAreas(ITenantAuthentication tenant, AreaSearchCriteria s /** * Get a area by token. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param areaToken * @return * @throws SiteWhereException @@ -254,9 +247,8 @@ SearchResults listAreas(ITenantAuthentication tenant, AreaSearchCriteria s /** * Create a new area type. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -266,9 +258,8 @@ SearchResults listAreas(ITenantAuthentication tenant, AreaSearchCriteria s /** * Update an existing area type. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param areaToken * @param request * @return @@ -280,9 +271,8 @@ Area updateArea(ITenantAuthentication tenant, String areaToken, AreaCreateReques /** * Delete an existing area type. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param areaToken * @return * @throws SiteWhereException @@ -292,9 +282,8 @@ Area updateArea(ITenantAuthentication tenant, String areaToken, AreaCreateReques /** * List alerts for an area. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param areaToken * @param searchCriteria * @return @@ -306,9 +295,8 @@ SearchResults listAlertsForArea(ITenantAuthentication tena /** * List device assignments for an area. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param areaToken * @param searchCriteria * @return @@ -321,9 +309,8 @@ SearchResults listDeviceAssignmentsForArea(ITenantAut /** * List command invocations for an area. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param areaToken * @param searchCriteria * @return @@ -335,9 +322,8 @@ SearchResults listCommandInvocationsForArea(ITenantAuth /** * Get label for area. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param areaToken * @param generatorId * @return @@ -349,9 +335,8 @@ byte[] getLabelForArea(ITenantAuthentication tenant, String areaToken, String ge /** * List locations for an area. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param areaToken * @param searchCriteria * @return @@ -363,9 +348,8 @@ SearchResults listLocationsForArea(ITenantAuthenticatio /** * List locations for an area. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param areaToken * @param searchCriteria * @return @@ -377,9 +361,8 @@ SearchResults listMeasurementsForArea(ITenantAuthent /** * List command responses for an area. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param areaToken * @param searchCriteria * @return @@ -391,9 +374,8 @@ SearchResults listCommandResponsesForArea(ITenan /** * List state changes for an area. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param areaToken * @param searchCriteria * @return @@ -405,9 +387,8 @@ SearchResults listStateChangesForArea(ITenantAuthent /** * List all areas in tree format. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @return * @throws SiteWhereException */ @@ -420,9 +401,8 @@ SearchResults listStateChangesForArea(ITenantAuthent /** * List asset types matching criteria. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @return * @throws SiteWhereException @@ -433,9 +413,8 @@ SearchResults listAssetTypes(ITenantAuthentication tenant, AssetTypeS /** * Get a asset type by token. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param assetTypeToken * @return * @throws SiteWhereException @@ -445,9 +424,8 @@ SearchResults listAssetTypes(ITenantAuthentication tenant, AssetTypeS /** * Create a new asset type type. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -457,9 +435,8 @@ SearchResults listAssetTypes(ITenantAuthentication tenant, AssetTypeS /** * Update an existing asset type type. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param assetTypeToken * @param request * @return @@ -471,9 +448,8 @@ AssetType updateAssetType(ITenantAuthentication tenant, String assetTypeToken, A /** * Delete an existing asset type type. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param assetTypeToken * @return * @throws SiteWhereException @@ -483,9 +459,8 @@ AssetType updateAssetType(ITenantAuthentication tenant, String assetTypeToken, A /** * Get label for asset type. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param assetTypeToken * @param generatorId * @return @@ -501,9 +476,8 @@ byte[] getLabelForAssetType(ITenantAuthentication tenant, String assetTypeToken, /** * List assets matching criteria. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @return * @throws SiteWhereException @@ -514,9 +488,8 @@ SearchResults listAssets(ITenantAuthentication tenant, AssetSearchCriteri /** * Get a asset by token. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param assetToken * @return * @throws SiteWhereException @@ -526,9 +499,8 @@ SearchResults listAssets(ITenantAuthentication tenant, AssetSearchCriteri /** * Create a new asset. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -538,9 +510,8 @@ SearchResults listAssets(ITenantAuthentication tenant, AssetSearchCriteri /** * Update an existing asset. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param assetToken * @param request * @return @@ -552,9 +523,8 @@ Asset updateAsset(ITenantAuthentication tenant, String assetToken, AssetCreateRe /** * Delete an existing asset. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param assetToken * @return * @throws SiteWhereException @@ -564,9 +534,8 @@ Asset updateAsset(ITenantAuthentication tenant, String assetToken, AssetCreateRe /** * Get label for asset. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param assetToken * @param generatorId * @return @@ -582,9 +551,8 @@ byte[] getLabelForAsset(ITenantAuthentication tenant, String assetToken, String /** * List device assignment matching criteria. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param format * @return @@ -597,9 +565,8 @@ SearchResults listDeviceAssignments(ITenantAuthentica /** * Get a device assignment by token. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException @@ -610,9 +577,8 @@ MarshaledDeviceAssignment getDeviceAssignmentByToken(ITenantAuthentication tenan /** * Create a new device assignment. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -623,9 +589,8 @@ MarshaledDeviceAssignment createDeviceAssignment(ITenantAuthentication tenant, /** * Update an existing device assignment. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return @@ -637,9 +602,8 @@ MarshaledDeviceAssignment updateDeviceAssignment(ITenantAuthentication tenant, S /** * Delete an existing device assignment. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException @@ -650,9 +614,8 @@ MarshaledDeviceAssignment deleteDeviceAssignment(ITenantAuthentication tenant, S /** * List alerts for a device assignment. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param token * @param searchCriteria * @return @@ -664,9 +627,8 @@ SearchResults listAlertsForDeviceAssignment(ITenantAuthent /** * Create alert event for device assignment. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return @@ -678,9 +640,8 @@ DeviceAlertWithAsset createAlertForDeviceAssignment(ITenantAuthentication tenant /** * Release an active device assignment. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException @@ -691,9 +652,8 @@ MarshaledDeviceAssignment releaseDeviceAssignment(ITenantAuthentication tenant, /** * List command invocations for a device assignment. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param token * @param includeCommand * @param searchCriteria @@ -706,9 +666,8 @@ SearchResults listCommandInvocationsForDeviceAssignment /** * Create command invocation event for assignment. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return @@ -720,9 +679,8 @@ DeviceCommandInvocation createCommandInvocationForDeviceAssignment(ITenantAuthen /** * Schedule command invocation. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @param scheduleToken * @param request @@ -735,9 +693,8 @@ ScheduledJob scheduleCommandInvocation(ITenantAuthentication tenant, String toke /** * Get label for device assignment. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @param generatorId * @return @@ -749,9 +706,8 @@ byte[] getLabelForDeviceAssignment(ITenantAuthentication tenant, String token, S /** * List location events for device assignment. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param token * @param searchCriteria * @return @@ -763,9 +719,8 @@ SearchResults listLocationsForDeviceAssignment(ITenantA /** * Create location event for assignment. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return @@ -777,9 +732,8 @@ DeviceLocationWithAsset createLocationForDeviceAssignment(ITenantAuthentication /** * List measurement events for device assignment. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param token * @param searchCriteria * @return @@ -791,9 +745,8 @@ SearchResults listMeasurementsForDeviceAssignment(IT /** * Create location event for assignment. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return @@ -805,9 +758,8 @@ DeviceMeasurementWithAsset createMeasurementForDeviceAssignment(ITenantAuthentic /** * List assignment measurements as chart series. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param token * @param searchCriteria * @return @@ -819,9 +771,8 @@ List> listMeasurementsForDeviceAssignmentAsChartSeries(ITena /** * Mark device assignment as missing. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException @@ -832,9 +783,8 @@ MarshaledDeviceAssignment markMissingDeviceAssignment(ITenantAuthentication tena /** * List command response events for assignment. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param token * @param searchCriteria * @return @@ -846,9 +796,8 @@ SearchResults listCommandResponsesForDeviceAssig /** * Create command response event for assignment. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return @@ -860,9 +809,8 @@ DeviceCommandResponseWithAsset createCommandResponseForDeviceAssignment(ITenantA /** * List state change events for assignment. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param token * @param searchCriteria * @return @@ -874,9 +822,8 @@ SearchResults listStateChangesForDeviceAssignment(IT /** * Create state change event for assignment. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return @@ -888,9 +835,8 @@ DeviceStateChangeWithAsset createStateChangeForDeviceAssignment(ITenantAuthentic /** * List alert events for device assignment. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -901,9 +847,8 @@ SearchResults bulkListAlertsForDeviceAssignments(ITenantAu /** * List command invocation events for assignment. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -914,9 +859,8 @@ SearchResults bulkListCommandInvocationsForDeviceAssign /** * List location events for device assignment. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -927,9 +871,8 @@ SearchResults bulkListLocationsForDeviceAssignments(ITe /** * List measurement events for multiple assignments. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -940,9 +883,8 @@ SearchResults bulkListMeasurementsForDeviceAssignmen /** * List measurements for multiple assignments as chart series. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -953,9 +895,8 @@ Map>> bulkListMeasurementsForDeviceAssignmentsA /** * List command response events for assignment. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -966,9 +907,8 @@ SearchResults bulkListCommandResponsesForDeviceA /** * List state change events for a device assignment. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -991,9 +931,8 @@ SearchResults bulkListStateChangesForDeviceAssignmen /** * Get authority by name. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param name * @return * @throws SiteWhereException @@ -1003,9 +942,8 @@ SearchResults bulkListStateChangesForDeviceAssignmen /** * Create a new authority. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -1016,9 +954,8 @@ GrantedAuthority createAuthority(ITenantAuthentication tenant, GrantedAuthorityC /** * Get authorities hierarchy. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @return * @throws SiteWhereException */ @@ -1031,9 +968,8 @@ GrantedAuthority createAuthority(ITenantAuthentication tenant, GrantedAuthorityC /** * List batch operations. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @return * @throws SiteWhereException @@ -1044,9 +980,8 @@ SearchResults listBatchOperations(ITenantAuthentication tenant, /** * Get a batch operation by token. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param batchToken * @return * @throws SiteWhereException @@ -1056,9 +991,8 @@ SearchResults listBatchOperations(ITenantAuthentication tenant, /** * List batch operation elements. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param operationToken * @return */ @@ -1068,9 +1002,8 @@ SearchResults listBatchOperationElements(ITenantAuthentication ten /** * Create new batch command invocation. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -1081,9 +1014,8 @@ BatchOperation createBatchCommandInvocation(ITenantAuthentication tenant, BatchC /** * Create batch command operation based on criteria. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -1098,9 +1030,8 @@ Object createBatchCommandOperationForCriteria(ITenantAuthentication tenant, /** * Get command invocation by unique id. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param id * @return * @throws SiteWhereException @@ -1111,9 +1042,8 @@ DeviceCommandInvocation getDeviceCommandInvocation(ITenantAuthentication tenant, /** * Get command invocation summary. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param id * @return * @throws SiteWhereException @@ -1124,9 +1054,8 @@ DeviceCommandInvocationSummary getDeviceCommandInvocationSummary(ITenantAuthenti /** * List responses for command invocation. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param id * @return * @throws SiteWhereException @@ -1141,9 +1070,8 @@ SearchResults listCommandResponsesForCommandInvocation(IT /** * List customer types matching criteria. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return @@ -1156,9 +1084,8 @@ SearchResults listCustomerTypes(ITenantAuthentication tenant, /** * Get a customer type by token. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param customerTypeToken * @return * @throws SiteWhereException @@ -1169,9 +1096,8 @@ CustomerType getCustomerTypeByToken(ITenantAuthentication tenant, String custome /** * Create a new customer type. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -1182,9 +1108,8 @@ CustomerType createCustomerType(ITenantAuthentication tenant, CustomerTypeCreate /** * Update an existing customer type. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param customerTypeToken * @param request * @return @@ -1196,9 +1121,8 @@ CustomerType updateCustomerType(ITenantAuthentication tenant, String customerTyp /** * Delete an existing customer type. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param customerTypeToken * @return * @throws SiteWhereException @@ -1208,9 +1132,8 @@ CustomerType updateCustomerType(ITenantAuthentication tenant, String customerTyp /** * Get label for customer type. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param customerTypeToken * @param generatorId * @return @@ -1226,9 +1149,8 @@ byte[] getLabelForCustomerType(ITenantAuthentication tenant, String customerType /** * List customers matching criteria. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return @@ -1240,9 +1162,8 @@ SearchResults listCustomers(ITenantAuthentication tenant, CustomerSear /** * Get a customer by token. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param customerToken * @return * @throws SiteWhereException @@ -1252,9 +1173,8 @@ SearchResults listCustomers(ITenantAuthentication tenant, CustomerSear /** * Create a new customer. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -1264,9 +1184,8 @@ SearchResults listCustomers(ITenantAuthentication tenant, CustomerSear /** * Update an existing customer. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param customerToken * @param request * @return @@ -1278,9 +1197,8 @@ Customer updateCustomer(ITenantAuthentication tenant, String customerToken, Cust /** * Delete an existing customer. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param customerToken * @return * @throws SiteWhereException @@ -1290,9 +1208,8 @@ Customer updateCustomer(ITenantAuthentication tenant, String customerToken, Cust /** * List alerts for a customer. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param customerToken * @param searchCriteria * @return @@ -1304,9 +1221,8 @@ SearchResults listAlertsForCustomer(ITenantAuthentication /** * List device assignments for a customer. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param customerToken * @param searchCriteria * @return @@ -1319,9 +1235,8 @@ SearchResults listDeviceAssignmentsForCustomer(ITenan /** * List command invocations for a customer. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param customerToken * @param searchCriteria * @return @@ -1333,9 +1248,8 @@ SearchResults listCommandInvocationsForCustomer(ITenant /** * Get label for customer. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param customerTypeToken * @param generatorId * @return @@ -1347,9 +1261,8 @@ byte[] getLabelForCustomer(ITenantAuthentication tenant, String customerTypeToke /** * List locations for a customer. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param customerToken * @param searchCriteria * @return @@ -1361,9 +1274,8 @@ SearchResults listLocationsForCustomer(ITenantAuthentic /** * List locations for a customer. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param customerToken * @param searchCriteria * @return @@ -1375,9 +1287,8 @@ SearchResults listMeasurementsForCustomer(ITenantAut /** * List command responses for a customer. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param customerToken * @param searchCriteria * @return @@ -1389,9 +1300,8 @@ SearchResults listCommandResponsesForCustomer(IT /** * List state changes for a customer. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param customerToken * @param searchCriteria * @return @@ -1403,9 +1313,8 @@ SearchResults listStateChangesForCustomer(ITenantAut /** * List all customer in tree format. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @return * @throws SiteWhereException */ @@ -1418,9 +1327,8 @@ SearchResults listStateChangesForCustomer(ITenantAut /** * List device commands matching criteria. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return @@ -1432,9 +1340,8 @@ SearchResults listDeviceCommands(ITenantAuthentication tenant, /** * Get a device command by token. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException @@ -1444,9 +1351,8 @@ SearchResults listDeviceCommands(ITenantAuthentication tenant, /** * Create a new device command. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -1457,9 +1363,8 @@ DeviceCommand createDeviceCommand(ITenantAuthentication tenant, DeviceCommandCre /** * Update an existing device command. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return @@ -1471,9 +1376,8 @@ DeviceCommand updateDeviceCommand(ITenantAuthentication tenant, String token, De /** * Delete an existing device command. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException @@ -1483,9 +1387,8 @@ DeviceCommand updateDeviceCommand(ITenantAuthentication tenant, String token, De /** * List device commands by namespace. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return @@ -1501,9 +1404,8 @@ SearchResults listDeviceCommandsByNamesapce(ITenantAuthe /** * Get a device event by alternate Id. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param alternateId * @return * @throws SiteWhereException @@ -1514,9 +1416,8 @@ DeviceEventWithAsset getDeviceEventByAlternateId(ITenantAuthentication tenant, S /** * Get a device event by Id. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param eventId * @return * @throws SiteWhereException @@ -1530,9 +1431,8 @@ DeviceEventWithAsset getDeviceEventByAlternateId(ITenantAuthentication tenant, S /** * List device groups matching criteria. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return @@ -1544,9 +1444,8 @@ SearchResults listDeviceGroups(ITenantAuthentication tenant, Device /** * Get a device group by token. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param groupToken * @return * @throws SiteWhereException @@ -1556,9 +1455,8 @@ SearchResults listDeviceGroups(ITenantAuthentication tenant, Device /** * Create a new device group. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -1569,9 +1467,8 @@ DeviceGroup createDeviceGroup(ITenantAuthentication tenant, DeviceGroupCreateReq /** * Update an existing device group. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param groupToken * @param request * @return @@ -1583,9 +1480,8 @@ DeviceGroup updateDeviceGroup(ITenantAuthentication tenant, String groupToken, D /** * Delete an existing device group. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param groupToken * @return * @throws SiteWhereException @@ -1595,9 +1491,8 @@ DeviceGroup updateDeviceGroup(ITenantAuthentication tenant, String groupToken, D /** * List elements in a device group. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return @@ -1610,9 +1505,8 @@ SearchResults listDeviceGroupElements(ITenantAuthentication /** * Add elements to device group. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param groupToken * @param requests * @return @@ -1624,9 +1518,8 @@ SearchResults addElementsToDdeviceGroup(ITenantAuthenticatio /** * Delete elements from device group. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param groupToken * @param elementIds * @return @@ -1638,9 +1531,8 @@ SearchResults deleteDeviceGroupElements(ITenantAuthenticatio /** * Delete elements from device group. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param groupToken * @param elementId * @return @@ -1652,9 +1544,8 @@ SearchResults deleteDeviceGroupElement(ITenantAuthentication /** * Get label for device group. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param groupToken * @param generatorId * @return @@ -1670,9 +1561,8 @@ byte[] getLabelForDeviceGroup(ITenantAuthentication tenant, String groupToken, S /** * List device states matching criteria. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return @@ -1688,9 +1578,8 @@ SearchResults listDeviceStates(ITenantAuthentication tenant, Device /** * List device statuses that match criteria.. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return @@ -1702,9 +1591,8 @@ SearchResults listDeviceStatuses(ITenantAuthentication tenant, /** * Get a device status by token. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException @@ -1714,9 +1602,8 @@ SearchResults listDeviceStatuses(ITenantAuthentication tenant, /** * Create a new device status. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -1727,9 +1614,8 @@ DeviceStatus createDeviceStatus(ITenantAuthentication tenant, DeviceStatusCreate /** * Update an existing device status. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return @@ -1741,9 +1627,8 @@ DeviceStatus updateDeviceStatus(ITenantAuthentication tenant, String token, Devi /** * Delete an existing device status. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException @@ -1757,9 +1642,8 @@ DeviceStatus updateDeviceStatus(ITenantAuthentication tenant, String token, Devi /** * List device types that match criteria.. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return @@ -1771,9 +1655,8 @@ SearchResults listDeviceTypes(ITenantAuthentication tenant, DeviceTy /** * Get a device type by token. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException @@ -1783,9 +1666,8 @@ SearchResults listDeviceTypes(ITenantAuthentication tenant, DeviceTy /** * Create a new device type. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -1796,9 +1678,8 @@ DeviceType createDeviceType(ITenantAuthentication tenant, DeviceTypeCreateReques /** * Update an existing device type. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return @@ -1810,9 +1691,8 @@ DeviceType updateDeviceType(ITenantAuthentication tenant, String token, DeviceTy /** * Delete an existing device type. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException @@ -1822,9 +1702,8 @@ DeviceType updateDeviceType(ITenantAuthentication tenant, String token, DeviceTy /** * Get label for device type. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @param generatorId * @return @@ -1836,9 +1715,8 @@ byte[] getLabelForDeviceType(ITenantAuthentication tenant, String token, String /** * Get device type specification GPB by unique token. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException @@ -1848,9 +1726,8 @@ byte[] getLabelForDeviceType(ITenantAuthentication tenant, String token, String /** * Download device type specification GPB by unique token. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException @@ -1864,9 +1741,8 @@ byte[] getLabelForDeviceType(ITenantAuthentication tenant, String token, String /** * List devices that match criteria.. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return @@ -1878,9 +1754,8 @@ SearchResults listDevices(ITenantAuthentication tenant, DeviceSearchCrit /** * Get a device by token. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param deviceToken * @return * @throws SiteWhereException @@ -1890,9 +1765,8 @@ SearchResults listDevices(ITenantAuthentication tenant, DeviceSearchCrit /** * Create a new device. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -1902,9 +1776,8 @@ SearchResults listDevices(ITenantAuthentication tenant, DeviceSearchCrit /** * Update an existing device. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param deviceToken * @param request * @return @@ -1916,9 +1789,8 @@ MarshaledDevice updateDevice(ITenantAuthentication tenant, String deviceToken, D /** * Delete an existing device. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param deviceToken * @return * @throws SiteWhereException @@ -1928,9 +1800,8 @@ MarshaledDevice updateDevice(ITenantAuthentication tenant, String deviceToken, D /** * List assignment history for device. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param deviceToken * @param searchCriteria * @param responseFormat @@ -1944,9 +1815,8 @@ SearchResults listDeviceAssignmentsForDevice(ITenantA /** * Add multiple events for device. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param deviceToken * @param batch * @return @@ -1958,9 +1828,8 @@ DeviceEventBatchResponse addMultipleEventsForDevice(ITenantAuthentication tenant /** * Get label for device. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param deviceToken * @param generatorId * @return @@ -1972,9 +1841,8 @@ byte[] getLabelForDevice(ITenantAuthentication tenant, String deviceToken, Strin /** * Create new device element mapping. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param deviceToken * @param request * @return @@ -1986,9 +1854,8 @@ MarshaledDevice createDeviceMappings(ITenantAuthentication tenant, String device /** * Delete existing device element mapping. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param deviceToken * @param path * @return @@ -2000,9 +1867,8 @@ MarshaledDevice deleteDeviceMappings(ITenantAuthentication tenant, String device /** * List devices in device group. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param groupToken * @param searchCriteria * @param responseFormat @@ -2015,9 +1881,8 @@ SearchResults listDevicesByDeviceGroup(ITenantAuthentication tenant, Str /** * List devices in device group with role. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param role * @param searchCriteria * @param responseFormat @@ -2042,9 +1907,8 @@ SearchResults listDevicesByDeviceGroupWithRole(ITenantAuthentication ten /** * List scheduled jobs matching criteria. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return @@ -2057,9 +1921,8 @@ SearchResults listScheduledJobs(ITenantAuthentication tenant, /** * Get a schedule job by token. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException @@ -2069,9 +1932,8 @@ SearchResults listScheduledJobs(ITenantAuthentication tenant, /** * Create a new schedule job. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -2082,9 +1944,8 @@ ScheduledJob createScheduledJob(ITenantAuthentication tenant, ScheduledJobCreate /** * Update an existing schedule job. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return @@ -2096,9 +1957,8 @@ ScheduledJob updateScheduledJob(ITenantAuthentication tenant, String token, Sche /** * Delete an existing schedule job. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException @@ -2112,9 +1972,8 @@ ScheduledJob updateScheduledJob(ITenantAuthentication tenant, String token, Sche /** * List schedules matching criteria. * - * @param tenant - * Tenant authentication information. Tenant - * authentication information. + * @param tenant Tenant authentication information. Tenant + * authentication information. * @param searchCriteria * @param responseFormat * @return @@ -2126,9 +1985,8 @@ SearchResults listSchedules(ITenantAuthentication tenant, ScheduleSear /** * Get a schedule by token. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @return * @throws SiteWhereException @@ -2138,9 +1996,8 @@ SearchResults listSchedules(ITenantAuthentication tenant, ScheduleSear /** * Create a new schedule. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param request * @return * @throws SiteWhereException @@ -2150,9 +2007,8 @@ SearchResults listSchedules(ITenantAuthentication tenant, ScheduleSear /** * Update an existing schedule. * - * @param tenant - * Tenant authentication information. Tenant authentication - * information. + * @param tenant Tenant authentication information. Tenant authentication + * information. * @param token * @param request * @return @@ -2164,8 +2020,7 @@ Schedule updateSchedule(ITenantAuthentication tenant, String token, ScheduleCrea /** * Delete an existing schedule. * - * @param tenant - * Tenant authentication information. + * @param tenant Tenant authentication information. * @param token * @return * @throws SiteWhereException @@ -2197,11 +2052,26 @@ Schedule updateSchedule(ITenantAuthentication tenant, String token, ScheduleCrea */ SearchResults listTenants(TenantSearchCriteria searchCriteria) throws SiteWhereException; + /** + * List Tenant Configuration Templates. + * + * @return List of {@link ITenantConfigurationTemplate} found. + * @throws SiteWhereException thrown in case of error. + */ + List listTenantConfigurationTemplates() throws SiteWhereException; + + /** + * List Tenant Dataset Templates. + * + * @return List of {@link ITenantDatasetTemplate} found. + * @throws SiteWhereException thrown in case of error. + */ + List listTenantDatasetTemplates() throws SiteWhereException; + /** * Get a tenant by token. * - * @param tenant - * Tenant authentication information.Token + * @param tenant Tenant authentication information.Token * @return * @throws SiteWhereException */ @@ -2219,8 +2089,7 @@ Schedule updateSchedule(ITenantAuthentication tenant, String token, ScheduleCrea /** * Update an existing tenant. * - * @param tenant - * Tenant authentication information.Token + * @param tenant Tenant authentication information.Token * @param request * @return * @throws SiteWhereException @@ -2230,8 +2099,7 @@ Schedule updateSchedule(ITenantAuthentication tenant, String token, ScheduleCrea /** * Delete an existing tenant. * - * @param tenant - * Tenant authentication information.Token + * @param tenant Tenant authentication information.Token * @return * @throws SiteWhereException */ @@ -2244,8 +2112,7 @@ Schedule updateSchedule(ITenantAuthentication tenant, String token, ScheduleCrea /** * List users matching criteria. * - * @param tenant - * Tenant authentication information. + * @param tenant Tenant authentication information. * @return * @throws SiteWhereException */ @@ -2254,8 +2121,7 @@ Schedule updateSchedule(ITenantAuthentication tenant, String token, ScheduleCrea /** * Get a user by username. * - * @param tenant - * Tenant authentication information. + * @param tenant Tenant authentication information. * @param username * @return * @throws SiteWhereException @@ -2265,8 +2131,7 @@ Schedule updateSchedule(ITenantAuthentication tenant, String token, ScheduleCrea /** * Create a new user. * - * @param tenant - * Tenant authentication information. + * @param tenant Tenant authentication information. * @param request * @return * @throws SiteWhereException @@ -2276,8 +2141,7 @@ Schedule updateSchedule(ITenantAuthentication tenant, String token, ScheduleCrea /** * Update an existing user. * - * @param tenant - * Tenant authentication information. + * @param tenant Tenant authentication information. * @param username * @param request * @return @@ -2288,8 +2152,7 @@ Schedule updateSchedule(ITenantAuthentication tenant, String token, ScheduleCrea /** * Delete an existing user. * - * @param tenant - * Tenant authentication information. + * @param tenant Tenant authentication information. * @param username * @return * @throws SiteWhereException @@ -2299,8 +2162,7 @@ Schedule updateSchedule(ITenantAuthentication tenant, String token, ScheduleCrea /** * Get authorities for user. * - * @param tenant - * Tenant authentication information. + * @param tenant Tenant authentication information. * @param username * @return * @throws SiteWhereException @@ -2314,8 +2176,7 @@ Schedule updateSchedule(ITenantAuthentication tenant, String token, ScheduleCrea /** * List zones matching criteria. * - * @param tenant - * Tenant authentication information. + * @param tenant Tenant authentication information. * @param searchCriteria * @return * @throws SiteWhereException @@ -2326,8 +2187,7 @@ SearchResults listZones(ITenantAuthentication tenant, ZoneSearchCriteria s /** * Get a zone by token. * - * @param tenant - * Tenant authentication information. + * @param tenant Tenant authentication information. * @param zoneToken * @return * @throws SiteWhereException @@ -2337,8 +2197,7 @@ SearchResults listZones(ITenantAuthentication tenant, ZoneSearchCriteria s /** * Create a new zone. * - * @param tenant - * Tenant authentication information. + * @param tenant Tenant authentication information. * @param request * @return * @throws SiteWhereException @@ -2348,8 +2207,7 @@ SearchResults listZones(ITenantAuthentication tenant, ZoneSearchCriteria s /** * Update an existing zone. * - * @param tenant - * Tenant authentication information. + * @param tenant Tenant authentication information. * @param zoneToken * @param request * @return @@ -2361,8 +2219,7 @@ Zone updateZone(ITenantAuthentication tenant, String zoneToken, ZoneCreateReques /** * Delete an existing zone. * - * @param tenant - * Tenant authentication information. + * @param tenant Tenant authentication information. * @param zoneToken * @return * @throws SiteWhereException diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/TenantConfigurationTemplate.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/TenantConfigurationTemplate.java new file mode 100644 index 0000000..5f9e3a8 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/TenantConfigurationTemplate.java @@ -0,0 +1,65 @@ +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 com.sitewhere.rest.model.tenant; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.sitewhere.spi.tenant.ITenantConfigurationTemplate; + +/** + * Default implementation of {@link ITenantConfigurationTemplate} interface used + * for REST services. + */ +@JsonInclude(Include.NON_NULL) +public class TenantConfigurationTemplate implements ITenantConfigurationTemplate { + + /** Unique id */ + private String id; + + /** Tenant Configuration Template name */ + private String name; + + /** Tenant Configuration Template description */ + private String description; + + @Override + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + @Override + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/TenantDatasetTemplate.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/TenantDatasetTemplate.java new file mode 100644 index 0000000..0a1991a --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/tenant/TenantDatasetTemplate.java @@ -0,0 +1,65 @@ +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 com.sitewhere.rest.model.tenant; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.sitewhere.spi.tenant.ITenantDatasetTemplate; + +/** + * Default implementation of {@link ITenantDatasetTemplate} interface used for + * REST services. + */ +@JsonInclude(Include.NON_NULL) +public class TenantDatasetTemplate implements ITenantDatasetTemplate { + + /** Unique id */ + private String id; + + /** Tenant dataset Template name */ + private String name; + + /** Tenant dataset Template description */ + private String description; + + @Override + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + @Override + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenantConfigurationTemplate.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenantConfigurationTemplate.java new file mode 100644 index 0000000..2dd74e9 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenantConfigurationTemplate.java @@ -0,0 +1,43 @@ +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 com.sitewhere.spi.tenant; + +/** + * Tenant Configuration Template + */ +public interface ITenantConfigurationTemplate { + + /** + * Get unique identifier. + * + * @return + */ + String getId(); + + /** + * Get name of the configuration template. + * + * @return + */ + String getName(); + + /** + * Get description of the configuration template. + * + * @return + */ + String getDescription(); +} diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenantDatasetTemplate.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenantDatasetTemplate.java new file mode 100644 index 0000000..978335f --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/tenant/ITenantDatasetTemplate.java @@ -0,0 +1,44 @@ +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 com.sitewhere.spi.tenant; + +/** + * Tenant Dataset Template + */ +public interface ITenantDatasetTemplate { + + /** + * Get unique identifier. + * + * @return + */ + String getId(); + + /** + * Get name of the dataset template. + * + * @return + */ + String getName(); + + /** + * Get description of the dataset template. + * + * @return + */ + String getDescription(); + +} From 6e3f81a63c61e0c85b5490f79d4b7f6dcf2ea574 Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Mon, 30 Nov 2020 16:37:59 -0500 Subject: [PATCH 46/48] fix: Refactor authorities/roles for Keycloak integration. --- build.gradle | 2 +- .../rest/client/user/UserRestTests.java | 4 +- .../model/user/request/UserCreateRequest.java | 19 +++-- .../spi/user/SiteWhereAuthorities.java | 64 ++++++++++++++++ .../spi/user/SiteWhereAuthority.java | 51 +++++++------ .../com/sitewhere/spi/user/SiteWhereRole.java | 21 +++--- .../sitewhere/spi/user/SiteWhereRoles.java | 73 ++----------------- 7 files changed, 118 insertions(+), 116 deletions(-) create mode 100644 sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereAuthorities.java diff --git a/build.gradle b/build.gradle index 9d6aead..4e51068 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.beta15' + version = '3.0.0.beta16' repositories { maven { url "https://repo.maven.apache.org/maven2" } diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java index 247f3d2..9de304e 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; -import com.sitewhere.spi.user.SiteWhereRole; import org.junit.Test; import com.sitewhere.rest.client.AbstractCRUDRestClientTests; @@ -30,6 +29,7 @@ import com.sitewhere.rest.model.user.request.UserCreateRequest; import com.sitewhere.spi.SiteWhereException; import com.sitewhere.spi.user.AccountStatus; +import com.sitewhere.spi.user.SiteWhereRole; /** * @@ -96,7 +96,7 @@ protected UserCreateRequest buildUpdateRequest(String token) throws SiteWhereExc request.setUsername(JOHN_DOE_USERNAME); request.setPassword("12345"); List roles = new ArrayList(); - roles.add(SiteWhereRole.ADMINISTER_TENANTS.getRoleName()); + roles.add(SiteWhereRole.SystemAdministrator.getRoleName()); request.setRoles(roles); return request; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java index 8154e38..70ef0d5 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java @@ -16,7 +16,6 @@ package com.sitewhere.rest.model.user.request; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; @@ -137,7 +136,7 @@ public void setStatus(AccountStatus status) { */ @Override public List getRoles() { - return Collections.unmodifiableList(this.roles); + return this.roles; } public void setRoles(List roles) { @@ -170,19 +169,19 @@ public Builder withStatus(AccountStatus status) { return this; } - public Builder withRole(IRole role) { - if (request.roles == null) { - request.roles = new ArrayList<>(); + public Builder withRole(String role) { + if (request.getRoles() == null) { + request.setRoles(new ArrayList<>()); } - request.roles.add(role.getRole()); + request.getRoles().add(role); return this; } - public Builder withRoles(List roles) { - if (request.roles == null) { - request.roles = new ArrayList<>(); + public Builder withRoles(List roles) { + if (request.getRoles() == null) { + request.setRoles(new ArrayList<>()); } - request.roles.addAll(roles.stream().map(IRole::getRole).collect(Collectors.toList())); + request.getRoles().addAll(roles); return this; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereAuthorities.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereAuthorities.java new file mode 100644 index 0000000..c72d859 --- /dev/null +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereAuthorities.java @@ -0,0 +1,64 @@ +/** + * Copyright © 2014-2020 The SiteWhere Authors + * + * 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 com.sitewhere.spi.user; + +/** + * Constants related to SiteWhere granted authorities. + */ +public interface SiteWhereAuthorities { + + /** Authority for all global server administration */ + public static final String ServerAdministrator = "ServerAdministrator"; + + /** Authority to view server information */ + public static final String ViewServerInformation = "ViewServerInformation"; + + /** Authority for all remote access authorities */ + public static final String RemoteAccessor = "RemoteAccessor"; + + /** Authority to access REST services */ + public static final String RestServicesAccess = "RestServicesAccess"; + + /** Authority to access administrative console */ + public static final String AdminConsoleAccess = "AdminConsoleAccess"; + + /** Authority for all user management access */ + public static final String UserAdministrator = "UserAdministrator"; + + /** Authority to administer all system users */ + public static final String AdminAllUsers = "AdminAllUsers"; + + /** Authority to administer own user account */ + public static final String AdminUserSelf = "AdminUserSelf"; + + /** Authority to administer all tenants */ + public static final String TenantAdministrator = "TenantAdministrator"; + + /** Authority to administer all system tenants */ + public static final String AdminAllTenants = "AdminAllTenants"; + + /** Authority to administer owned tenants */ + public static final String AdminOwnedTenants = "AdminOwnedTenants"; + + /** Administrator for all schedule authorities */ + public static final String ScheduleAdministrator = "ScheduleAdministrator"; + + /** Authority to administer all system schedules */ + public static final String AdminAllSchedules = "AdminAllSchedules"; + + /** Authority to schedule commands */ + public static final String ScheduleCommands = "ScheduleCommands"; +} \ No newline at end of file diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereAuthority.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereAuthority.java index a093ac2..6cf9592 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereAuthority.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereAuthority.java @@ -20,51 +20,56 @@ */ public enum SiteWhereAuthority { - /** Group for server administration */ - Server(SiteWhereRoles.GRP_SERVER, "Server administration", null, true), + /** Authority for server administrator */ + ServerAdministrator(SiteWhereAuthorities.ServerAdministrator, "Server administration", null, true), /** View global server information */ - ViewServerInfo(SiteWhereRoles.AUTH_VIEW_SERVER_INFO, "View global server information", SiteWhereRoles.GRP_SERVER, - false), + ViewServerInformation(SiteWhereAuthorities.ViewServerInformation, "View global server information", + SiteWhereAuthorities.ServerAdministrator, false), - /** Group for system access setting */ - Access(SiteWhereRoles.GRP_ACCESS, "Remote access", null, true), + /** Authority for all remote access */ + RemoteAccessor(SiteWhereAuthorities.RemoteAccessor, "Remote accessor", null, true), /** REST services access */ - REST(SiteWhereRoles.AUTH_REST, "REST services access", SiteWhereRoles.GRP_ACCESS, false), + RestServicesAccess(SiteWhereAuthorities.RestServicesAccess, "REST services access", + SiteWhereAuthorities.RemoteAccessor, false), - /** REST services access */ - AdminConsole(SiteWhereRoles.AUTH_ADMIN_CONSOLE, "Administrative console login", SiteWhereRoles.GRP_ACCESS, false), + /** Admin UI console access */ + AdminConsoleAccess(SiteWhereAuthorities.AdminConsoleAccess, "Administrative console login", + SiteWhereAuthorities.RemoteAccessor, false), /** Group for all user authorities */ - Users(SiteWhereRoles.GRP_USERS, "Users", null, true), + UserAdministrator(SiteWhereAuthorities.UserAdministrator, "User administrator", null, true), /** Administer all users */ - AdminUsers(SiteWhereRoles.AUTH_ADMINISTER_USERS, "Administer all users", SiteWhereRoles.GRP_USERS, false), + AdminAllUsers(SiteWhereAuthorities.AdminAllUsers, "Administer all users", SiteWhereAuthorities.UserAdministrator, + false), /** Administer own user profile */ - AdminSelf(SiteWhereRoles.AUTH_ADMINISTER_USER_SELF, "Administer own user profile", SiteWhereRoles.GRP_USERS, false), + AdminUserSelf(SiteWhereAuthorities.AdminUserSelf, "Administer own user profile", + SiteWhereAuthorities.UserAdministrator, false), - /** Group for all tenant authorities */ - Tenants(SiteWhereRoles.GRP_TENANTS, "Tenants", null, true), + /** Administrator with all tenant authorities */ + TenantAdministrator(SiteWhereAuthorities.TenantAdministrator, "Tenant administrator", null, true), /** Administer all users */ - AdminTenants(SiteWhereRoles.AUTH_ADMINISTER_TENANTS, "Administer all tenants", SiteWhereRoles.GRP_TENANTS, false), + AdminAllTenants(SiteWhereAuthorities.AdminAllTenants, "Administer all tenants", + SiteWhereAuthorities.TenantAdministrator, false), /** Administer own tenant */ - AdminOwnTenant(SiteWhereRoles.AUTH_ADMINISTER_TENANT_SELF, "Administer own tenant", SiteWhereRoles.GRP_TENANTS, - false), + AdminOwnedTenants(SiteWhereAuthorities.AdminOwnedTenants, "Administer owned tenants", + SiteWhereAuthorities.TenantAdministrator, false), - /** Group for all schedules */ - Schedules(SiteWhereRoles.GRP_SCHEDULES, "Schedules", null, true), + /** Administrator with all schedule authorities */ + ScheduleAdministrator(SiteWhereAuthorities.ScheduleAdministrator, "Schedule administrator", null, true), /** Administer all schedules */ - AdminSchedules(SiteWhereRoles.AUTH_ADMINISTER_SCHEDULES, "Administer schedules", SiteWhereRoles.GRP_SCHEDULES, - false), + AdminAllSchedules(SiteWhereAuthorities.AdminAllSchedules, "Administer schedules", + SiteWhereAuthorities.ScheduleAdministrator, false), /** Add scheduled job for batch or indivisual command invocation */ - ScheduleCommands(SiteWhereRoles.AUTH_SCHEDULE_COMMANDS, "Schedule batch or individial commands", - SiteWhereRoles.GRP_SCHEDULES, false); + ScheduleCommands(SiteWhereAuthorities.ScheduleCommands, "Schedule batch or individial commands", + SiteWhereAuthorities.ScheduleAdministrator, false); /** Authority name */ private String name; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java index a9f9b5a..a58000b 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRole.java @@ -20,18 +20,15 @@ import java.util.stream.Collectors; public enum SiteWhereRole { - REST("ROLE_REST", "REST services access", Arrays.asList(SiteWhereAuthority.REST)), ADMIN_CONSOLE( - "ROLE_ADMIN_CONSOLE", "Administrative console login", - Arrays.asList(SiteWhereAuthority.AdminConsole)), VIEW_SERVER_INFO("ROLE_VIEW_SERVER_INFO", - "View global server information", - Arrays.asList(SiteWhereAuthority.ViewServerInfo)), ADMINISTER_USERS("ROLE_ADMINISTER_USERS", - "Administer all users", Arrays.asList(SiteWhereAuthority.AdminUsers)), ADMINISTER_USER_SELF( - "ROLE_ADMINISTER_USER_SELF", "Administer own user profile", - Arrays.asList(SiteWhereAuthority.AdminSelf)), ADMINISTER_TENANTS( - "ROLE_ADMINISTER_TENANTS", "Administer all tenants", - Arrays.asList(SiteWhereAuthority.AdminTenants)), ADMINISTER_TENANT_SELF( - "ROLE_ADMINISTER_TENANT_SELF", "Administer own tenant", - Arrays.asList(SiteWhereAuthority.AdminOwnTenant)); + /** System admin with all authorities */ + SystemAdministrator(SiteWhereRoles.SystemAdministrator, "System Administrator", + Arrays.asList(SiteWhereAuthority.ServerAdministrator, SiteWhereAuthority.RemoteAccessor, + SiteWhereAuthority.UserAdministrator, SiteWhereAuthority.TenantAdministrator, + SiteWhereAuthority.ScheduleAdministrator)), + + /** Role with only external access rights */ + RemoteAccessOnly(SiteWhereRoles.RemoteAccessOnly, "Remote Accessor", + Arrays.asList(SiteWhereAuthority.RemoteAccessor)); private String roleName; private String description; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRoles.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRoles.java index 1ce8a20..b5f637a 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRoles.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/SiteWhereRoles.java @@ -15,78 +15,15 @@ */ package com.sitewhere.spi.user; -/** - * Constants related to SiteWhere granted authorities. - */ public interface SiteWhereRoles { - /** Group for system access authorities */ - public static final String GRP_ACCESS = "GRP_ACCESS"; - - /** Authority to access REST services */ - public static final String AUTH_REST = "REST"; - - /** Authority to access administrative console */ - public static final String AUTH_ADMIN_CONSOLE = "ADMIN_CONSOLE"; - - /** Group for global server administration */ - public static final String GRP_SERVER = "GRP_SERVER"; - - /** Authority to view server information */ - public static final String AUTH_VIEW_SERVER_INFO = "VIEW_SERVER_INFO"; - - /** Group for user authorities */ - public static final String GRP_USERS = "GRP_USERS"; - - /** Authority to administer all system users */ - public static final String AUTH_ADMINISTER_USERS = "ADMINISTER_USERS"; - - /** Authority to administer own user account */ - public static final String AUTH_ADMINISTER_USER_SELF = "ADMINISTER_USER_SELF"; - - /** Group for tenant authorities */ - public static final String GRP_TENANTS = "GRP_TENANTS"; - - /** Authority to administer all system tenants */ - public static final String AUTH_ADMINISTER_TENANTS = "ADMINISTER_TENANTS"; - - /** Authority to administer own tenant */ - public static final String AUTH_ADMINISTER_TENANT_SELF = "ADMINISTER_TENANT_SELF"; - - /** Group for schedule authorities */ - public static final String GRP_SCHEDULES = "GRP_SCHEDULES"; - - /** Authority to administer all system schedules */ - public static final String AUTH_ADMINISTER_SCHEDULES = "ADMINISTER_SCHEDULES"; - - /** Authority to schedule commands */ - public static final String AUTH_SCHEDULE_COMMANDS = "SCHEDULE_COMMANDS"; - /******************** * ROLE DEFINITIONS * ********************/ - /** Prefix for Spring Security roles */ - public static final String ROLE_PREFIX = "ROLE_"; - - /** Role for access to REST services */ - public static final String REST = ROLE_PREFIX + AUTH_REST; - - /** Role for access to administrative console */ - public static final String ADMIN_CONSOLE = ROLE_PREFIX + AUTH_ADMIN_CONSOLE; - - /** Role for viewing server information */ - public static final String VIEW_SERVER_INFO = ROLE_PREFIX + AUTH_VIEW_SERVER_INFO; - - /** Role to administer all system users */ - public static final String ADMINISTER_USERS = ROLE_PREFIX + AUTH_ADMINISTER_USERS; - - /** Role to administer own user account */ - public static final String ADMINISTER_USER_SELF = ROLE_PREFIX + AUTH_ADMINISTER_USER_SELF; - - /** Role to administer all system tenants */ - public static final String ADMINISTER_TENANTS = ROLE_PREFIX + AUTH_ADMINISTER_TENANTS; + /** Full system administration role */ + public static final String SystemAdministrator = "SystemAdministrator"; - /** Role to administer all system tenants */ - public static final String ADMINISTER_TENANT_SELF = ROLE_PREFIX + AUTH_ADMINISTER_TENANT_SELF; -} \ No newline at end of file + /** Role with only remote access privileges */ + public static final String RemoteAccessOnly = "RemoteAccessOnly"; +} From 6696abe9420ed5f7bddecdb0d52063a96bcb9e7f Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Wed, 13 Jan 2021 10:28:25 -0500 Subject: [PATCH 47/48] fix: User management API updates for Keycloak integration. --- build.gradle | 2 +- .../rest/client/user/UserRestTests.java | 5 +-- .../com/sitewhere/rest/model/user/User.java | 38 ++++--------------- .../model/user/request/UserCreateRequest.java | 27 +++++++------ .../java/com/sitewhere/spi/user/IUser.java | 14 ++----- .../spi/user/request/IUserCreateRequest.java | 5 +-- 6 files changed, 32 insertions(+), 59 deletions(-) diff --git a/build.gradle b/build.gradle index 4e51068..849740e 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.beta16' + version = '3.0.0.beta17' repositories { maven { url "https://repo.maven.apache.org/maven2" } diff --git a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java index 9de304e..8507e85 100644 --- a/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java +++ b/sitewhere-java-client/src/test/java/com/sitewhere/rest/client/user/UserRestTests.java @@ -28,7 +28,6 @@ import com.sitewhere.rest.model.user.User; import com.sitewhere.rest.model.user.request.UserCreateRequest; import com.sitewhere.spi.SiteWhereException; -import com.sitewhere.spi.user.AccountStatus; import com.sitewhere.spi.user.SiteWhereRole; /** @@ -55,7 +54,7 @@ protected UserCreateRequest buildCreateRequest(String token) throws SiteWhereExc request.setToken(token); request.setFirstName("John"); request.setLastName("Doe"); - request.setStatus(AccountStatus.Active); + request.setEnabled(true); request.setUsername(JOHN_DOE_USERNAME); request.setPassword("1234"); List authorities = new ArrayList(); @@ -92,7 +91,7 @@ protected UserCreateRequest buildUpdateRequest(String token) throws SiteWhereExc request.setToken(token); request.setFirstName("John"); request.setLastName("Doe"); - request.setStatus(AccountStatus.Active); + request.setEnabled(true); request.setUsername(JOHN_DOE_USERNAME); request.setPassword("12345"); List roles = new ArrayList(); diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java index ba1094c..fae6195 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/User.java @@ -17,16 +17,12 @@ import java.io.Serializable; import java.util.ArrayList; -import java.util.Date; import java.util.List; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.sitewhere.rest.model.common.PersistentEntity; import com.sitewhere.spi.SiteWhereException; -import com.sitewhere.spi.user.AccountStatus; import com.sitewhere.spi.user.IRole; import com.sitewhere.spi.user.IUser; @@ -51,14 +47,10 @@ public class User extends PersistentEntity implements IUser { /** Email address */ private String email; - /** Last login */ - private Date lastLogin; - - /** Account status */ - private AccountStatus status; + /** Enabled indicator */ + private boolean enabled; /** List of roles */ - @JsonIgnore private List roles = new ArrayList<>(); /* @@ -110,28 +102,15 @@ public void setEmail(String email) { } /* - * @see com.sitewhere.spi.user.IUser#getLastLogin() - */ - @Override - @JsonFormat(shape = JsonFormat.Shape.STRING) - public Date getLastLogin() { - return lastLogin; - } - - public void setLastLogin(Date lastLogin) { - this.lastLogin = lastLogin; - } - - /* - * @see com.sitewhere.spi.user.IUser#getStatus() + * @see com.sitewhere.spi.user.IUser#isEnabled() */ @Override - public AccountStatus getStatus() { - return status; + public boolean isEnabled() { + return enabled; } - public void setStatus(AccountStatus status) { - this.status = status; + public void setEnabled(boolean enabled) { + this.enabled = enabled; } /* @@ -158,8 +137,7 @@ public static User copy(IUser input) throws SiteWhereException { result.setFirstName(input.getFirstName()); result.setLastName(input.getLastName()); result.setEmail(input.getEmail()); - result.setLastLogin(input.getLastLogin()); - result.setStatus(input.getStatus()); + result.setEnabled(input.isEnabled()); result.setRoles(new ArrayList<>(input.getRoles())); PersistentEntity.copy(input, result); return result; diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java index 70ef0d5..d358b10 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/rest/model/user/request/UserCreateRequest.java @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.sitewhere.rest.model.common.request.PersistentEntityCreateRequest; -import com.sitewhere.spi.user.AccountStatus; import com.sitewhere.spi.user.IRole; import com.sitewhere.spi.user.IUser; import com.sitewhere.spi.user.request.IUserCreateRequest; @@ -53,8 +52,8 @@ public class UserCreateRequest extends PersistentEntityCreateRequest implements /** User email */ private String email; - /** User status */ - private AccountStatus status; + /** Enablement indicator */ + private boolean enabled; /** User authorities */ private List roles = new ArrayList<>(); @@ -120,15 +119,15 @@ public void setEmail(String email) { } /* - * @see com.sitewhere.spi.user.request.IUserCreateRequest#getStatus() + * @see com.sitewhere.spi.user.request.IUserCreateRequest#isEnabled() */ @Override - public AccountStatus getStatus() { - return status; + public boolean isEnabled() { + return enabled; } - public void setStatus(AccountStatus status) { - this.status = status; + public void setEnabled(boolean enabled) { + this.enabled = enabled; } /* @@ -153,19 +152,25 @@ public Builder(String username, String password, String firstName, String lastNa request.setPassword(password); request.setFirstName(firstName); request.setLastName(lastName); + request.setEnabled(true); } public Builder(IUser existing) { request.setUsername(existing.getUsername()); request.setFirstName(existing.getFirstName()); request.setLastName(existing.getLastName()); - request.setStatus(existing.getStatus()); + request.setEnabled(existing.isEnabled()); request.setRoles(existing.getRoles().stream().map(IRole::getRole).collect(Collectors.toList())); request.setMetadata(existing.getMetadata()); } - public Builder withStatus(AccountStatus status) { - request.setStatus(status); + public Builder enabled() { + request.setEnabled(true); + return this; + } + + public Builder disabled() { + request.setEnabled(false); return this; } diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java index e2a30b6..7e4c5fb 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/IUser.java @@ -15,7 +15,6 @@ */ package com.sitewhere.spi.user; -import java.util.Date; import java.util.List; import com.sitewhere.spi.common.IPersistentEntity; @@ -54,18 +53,11 @@ public interface IUser extends IPersistentEntity { String getEmail(); /** - * Get the last login date. - * - * @return - */ - Date getLastLogin(); - - /** - * Get the account status. - * + * Enablement indicator. + * * @return */ - AccountStatus getStatus(); + boolean isEnabled(); /** * Get the list roles. diff --git a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java index 635f3c2..dae96a2 100644 --- a/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java +++ b/sitewhere-java-model/src/main/java/com/sitewhere/spi/user/request/IUserCreateRequest.java @@ -18,7 +18,6 @@ import java.util.List; import com.sitewhere.spi.common.request.IPersistentEntityCreateRequest; -import com.sitewhere.spi.user.AccountStatus; /** * Interface for arguments needed to create a user. @@ -61,11 +60,11 @@ public interface IUserCreateRequest extends IPersistentEntityCreateRequest { String getEmail(); /** - * Get the account status. + * Get enablement indicator. * * @return */ - AccountStatus getStatus(); + boolean isEnabled(); /** * Get the list of roles. From 014e00f7fb4d8a18dfdada27a5c98f9d47af84c7 Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Fri, 15 Jan 2021 13:43:18 -0500 Subject: [PATCH 48/48] chore: Update version. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 849740e..c3f3da1 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'distribution' allprojects { group = 'com.sitewhere' - version = '3.0.0.beta17' + version = '3.0.0' repositories { maven { url "https://repo.maven.apache.org/maven2" }