From f3a6d1964938f82099b94fea6fc8019b6656ddf9 Mon Sep 17 00:00:00 2001 From: "tcdlpds@gmail.com" Date: Mon, 27 Jan 2020 21:32:16 +0530 Subject: [PATCH] Improve DeviceTypeCommonService Interface --- .../wso2/carbon/device/mgt/common/EnrolmentInfo.java | 2 +- .../mgt/common/spi/DeviceTypeCommonService.java | 5 ++--- .../org.wso2.carbon.device.mgt.core/pom.xml | 6 +++--- pom.xml | 12 ++++++------ 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/EnrolmentInfo.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/EnrolmentInfo.java index 11178e2204..af44df25c2 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/EnrolmentInfo.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/EnrolmentInfo.java @@ -34,7 +34,7 @@ public class EnrolmentInfo implements Serializable { } public enum OwnerShip { - BYOD, COPE, WORK_PROFILE, GOOGLE_ENTERPRISE + BYOD, COPE, WORK_PROFILE, GOOGLE_ENTERPRISE, COSU } @ApiModelProperty(name = "id", value = "ID of the device in the WSO2 EMM device information database.", diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/spi/DeviceTypeCommonService.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/spi/DeviceTypeCommonService.java index 383166d05c..7b324a565f 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/spi/DeviceTypeCommonService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/spi/DeviceTypeCommonService.java @@ -17,7 +17,6 @@ package org.wso2.carbon.device.mgt.common.spi; -import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import java.util.Map; @@ -30,8 +29,8 @@ public interface DeviceTypeCommonService { /** * To get Enrollment QR code against Ownership type * - * @return QR code Map, Key as Ownership Type and Value as QR string + * @return QR code Map which contains key value pairs to have for the QR String. * @throws DeviceManagementException if error occurred while generating the QR String for Ownership */ - Map getEnrollmentQRCode() throws DeviceManagementException; + Map getEnrollmentQRCode(String ownershipType) throws DeviceManagementException; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml index ac8b37e2db..2f5e878a9d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml @@ -348,9 +348,9 @@ javax.ws.rs jsr311-api - - javassist - javassist + + org.javassist + javassist org.powermock diff --git a/pom.xml b/pom.xml index 5a7b82458e..198bcd3260 100644 --- a/pom.xml +++ b/pom.xml @@ -1683,11 +1683,11 @@ jackson-datatype-joda ${jackson.datatype.joda.version} - - javassist - javassist - ${javassist.version} - + + org.javassist + javassist + ${javassist.version} + org.wso2.carbon.analytics-common org.wso2.carbon.event.receiver.stub @@ -2234,7 +2234,7 @@ 2.1.5 1.9 (1.9,2.0] - 3.12.1.GA + 3.26.0-GA true