Renamed isEnabled into Enabled for the consistency

revert-70aa11f8
Rasika Perera 7 years ago
parent 08f4f04101
commit 3a9261536e

@ -27,14 +27,14 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "GeoLocationConfiguration") @XmlRootElement(name = "GeoLocationConfiguration")
public class GeoLocationConfiguration { public class GeoLocationConfiguration {
private boolean isEnabled; private boolean enabled;
public boolean getIsEnabled() { public boolean getEnabled() {
return isEnabled; return enabled;
} }
@XmlElement(name = "isEnabled", required = true) @XmlElement(name = "Enabled", required = true)
public void setIsEnabled(boolean isEnabled) { public void setEnabled(boolean enabled) {
this.isEnabled = isEnabled; this.enabled = enabled;
} }
} }

@ -89,13 +89,13 @@
<ExpiryTime>86400</ExpiryTime> <ExpiryTime>86400</ExpiryTime>
</CertificateCacheConfiguration> </CertificateCacheConfiguration>
<GeoLocationConfiguration> <GeoLocationConfiguration>
<isEnabled>false</isEnabled> <Enabled>false</Enabled>
</GeoLocationConfiguration> </GeoLocationConfiguration>
<OperationAnalyticsConfiguration> <OperationAnalyticsConfiguration>
<PublishLocationResponse>false</PublishLocationResponse> <PublishLocationResponse>false</PublishLocationResponse>
<PublishDeviceInfoResponse>false</PublishDeviceInfoResponse> <PublishDeviceInfoResponse>false</PublishDeviceInfoResponse>
<PublishOperationResponse> <PublishOperationResponse>
<isEnabled>false</isEnabled> <Enabled>false</Enabled>
<Operations> <Operations>
<!-- Publish specific operation responses --> <!-- Publish specific operation responses -->
<!-- <!--

@ -73,7 +73,7 @@ deviceModule = function () {
} }
var userName = carbonUser.username + "@" + carbonUser.domain; var userName = carbonUser.username + "@" + carbonUser.domain;
var locationHistory = []; var locationHistory = [];
var geoServicesEnabled = devicemgtProps.serverConfig.geoLocationConfiguration.isEnabled; var geoServicesEnabled = devicemgtProps.serverConfig.geoLocationConfiguration.enabled;
if (geoServicesEnabled) { if (geoServicesEnabled) {
try { try {
var fromDate = new Date(); var fromDate = new Date();

@ -119,13 +119,13 @@
</ArchivalTask> </ArchivalTask>
</ArchivalConfiguration> </ArchivalConfiguration>
<GeoLocationConfiguration> <GeoLocationConfiguration>
<isEnabled>false</isEnabled> <Enabled>false</Enabled>
</GeoLocationConfiguration> </GeoLocationConfiguration>
<OperationAnalyticsConfiguration> <OperationAnalyticsConfiguration>
<PublishLocationResponse>false</PublishLocationResponse> <PublishLocationResponse>false</PublishLocationResponse>
<PublishDeviceInfoResponse>false</PublishDeviceInfoResponse> <PublishDeviceInfoResponse>false</PublishDeviceInfoResponse>
<PublishOperationResponse> <PublishOperationResponse>
<isEnabled>false</isEnabled> <Enabled>false</Enabled>
<Operations> <Operations>
<!-- Publish specific operation responses --> <!-- Publish specific operation responses -->
<!-- <!--

Loading…
Cancel
Save