From 35b03d387c71914ba2cd9bf1601e67ed477f3d6c Mon Sep 17 00:00:00 2001 From: Yohan Avishke Date: Mon, 2 Sep 2019 00:47:25 +0530 Subject: [PATCH] fix: Change in file name File name of AttributeDataType was changed to AttributeType to resolve some conflicts with import statements. --- .../device/mgt/jaxrs/beans/analytics/Attribute.java | 10 +++++----- .../{AttributeDataType.java => AttributeType.java} | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) rename components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/{AttributeDataType.java => AttributeType.java} (96%) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/Attribute.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/Attribute.java index d661fdef9fd..8c334972e39 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/Attribute.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/Attribute.java @@ -31,15 +31,15 @@ public class Attribute { private String name; @ApiModelProperty(value = "Event attribute data type") @JsonProperty("type") - private AttributeDataType type; + private AttributeType type; public Attribute() { } - public Attribute(String name, AttributeDataType attributeDataType) { + public Attribute(String name, AttributeType attributeType) { this.name = name; - this.type = attributeDataType; + this.type = attributeType; } public String getName() { return name; @@ -49,11 +49,11 @@ public class Attribute { this.name = name; } - public AttributeDataType getType() { + public AttributeType getType() { return type; } - public void setType(AttributeDataType type) { + public void setType(AttributeType type) { this.type = type; } } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/AttributeDataType.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/AttributeType.java similarity index 96% rename from components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/AttributeDataType.java rename to components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/AttributeType.java index d7acab5696b..660176a3cca 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/AttributeDataType.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/AttributeType.java @@ -21,7 +21,7 @@ package org.wso2.carbon.device.mgt.jaxrs.beans.analytics; /** * Attribute data types */ -public enum AttributeDataType { +public enum AttributeType { STRING, LONG, BOOL, INT, FLOAT, DOUBLE; @Override