community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve DeviceTypeCommonService Interface

Browse Source
This commit is contained in:
tcdlpds@gmail.com 2020-01-27 21:32:16 +05:30
parent df6848458d
commit f3a6d19649
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/EnrolmentInfo.java
View File

@ -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.",

5
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/spi/DeviceTypeCommonService.java
View File

@ -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<EnrolmentInfo.OwnerShip, String> getEnrollmentQRCode() throws DeviceManagementException;
Map<String, Object> getEnrollmentQRCode(String ownershipType) throws DeviceManagementException;
}

6
components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
View File

@ -348,9 +348,9 @@
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</dependency>
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
<dependency>
<groupId>org.powermock</groupId>

12
pom.xml
View File

@ -1683,11 +1683,11 @@
<artifactId>jackson-datatype-joda</artifactId>
<version>${jackson.datatype.joda.version}</version>
</dependency>
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.analytics-common</groupId>
<artifactId>org.wso2.carbon.event.receiver.stub</artifactId>
@ -2234,7 +2234,7 @@
<jackson.datatype.joda.version>2.1.5</jackson.datatype.joda.version>
<commons.codec.verision>1.9</commons.codec.verision>
<commons.codec.verision.range>(1.9,2.0]</commons.codec.verision.range>
<javassist.version>3.12.1.GA</javassist.version>
<javassist.version>3.26.0-GA</javassist.version>
<maven.javadoc.skip>true</maven.javadoc.skip>
<!-- jacoco plugin version -->