Merge branch 'application-mgt-new' into 'master'

Improve DeviceTypeCommonService Interface

See merge request entgra/carbon-device-mgt!434
feature/appm-store/pbac
Saad Sahibjan 5 years ago
commit 49d26706b0

@ -34,7 +34,7 @@ public class EnrolmentInfo implements Serializable {
} }
public enum OwnerShip { 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.", @ApiModelProperty(name = "id", value = "ID of the device in the WSO2 EMM device information database.",

@ -17,7 +17,6 @@
package org.wso2.carbon.device.mgt.common.spi; 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 org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
import java.util.Map; import java.util.Map;
@ -30,8 +29,8 @@ public interface DeviceTypeCommonService {
/** /**
* To get Enrollment QR code against Ownership type * 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 * @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;
} }

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

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

Loading…
Cancel
Save