turcy
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0-M1

Browse Source 
Conflicts:
	components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/VirtualFireAlarmService.java
Shabirmean 9 years ago
parent d13c3f8dde d40aa73cab
commit a392dd799b
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File

6
components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/ArduinoService.java
Unescape View File

@ -486,7 +486,7 @@ public class ArduinoService {
*/ */
@Path("controller/bulb/{state}") @Path("controller/bulb/{state}")
@POST @POST
@Feature( code="ARDUINO_BULB_CONTROL", name="Control Bulb", @Feature( code="ARDUINO_BULB_CONTROL", name="Control Bulb", type = "monitor",
description="Control Bulb on Arduino Arduino") description="Control Bulb on Arduino Arduino")
public void switchBulb(@HeaderParam("owner") String owner, public void switchBulb(@HeaderParam("owner") String owner,
@HeaderParam("deviceId") String deviceId, @HeaderParam("deviceId") String deviceId,
@ -557,8 +557,6 @@ public class ArduinoService {
@Path("controller/pushdata") @Path("controller/pushdata")
@POST @POST
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
@Feature( code="ARDUINO_READ_DATA", name="Read Data",
description="Read Data from Arduino")
public void pushData(final DeviceJSON dataMsg, @Context HttpServletResponse response) { public void pushData(final DeviceJSON dataMsg, @Context HttpServletResponse response) {
String owner = dataMsg.owner; String owner = dataMsg.owner;
@ -651,8 +649,6 @@ public class ArduinoService {
@Path("controller/push_temperature") @Path("controller/push_temperature")
@POST @POST
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
@Feature( code="ARDUINO_READ_TEMP", name="Read Tempreature",
description="Read Tempreature from Arduino")
public void pushTemperatureData(final DeviceJSON dataMsg, public void pushTemperatureData(final DeviceJSON dataMsg,
@Context HttpServletResponse response, @Context HttpServletResponse response,
@Context HttpServletRequest request) { @Context HttpServletRequest request) {

26
components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.api/src/main/java/org/wso2/carbon/device/mgt/iot/digitaldisplay/api/DigitalDisplayControllerService.java
Unescape View File

@ -69,7 +69,7 @@ public class DigitalDisplayControllerService {
*/ */
@Path("/restart-browser") @Path("/restart-browser")
@POST @POST
@Feature(code = "DISPLAY_BROWSERRESTART", name = "Restart Browser", @Feature(code = "DISPLAY_BROWSERRESTART", name = "Restart Browser", type = "operation",
description = "Restart Browser in Digital Display") description = "Restart Browser in Digital Display")
public void restartBrowser(@HeaderParam("deviceId") String deviceId, public void restartBrowser(@HeaderParam("deviceId") String deviceId,
@HeaderParam("owner") String owner, @HeaderParam("owner") String owner,
@ -102,7 +102,7 @@ public class DigitalDisplayControllerService {
*/ */
@Path("/close-browser") @Path("/close-browser")
@POST @POST
@Feature(code = "DISPLAY_BROWSERCLOSE", name = "Close Browser", @Feature(code = "DISPLAY_BROWSERCLOSE", name = "Close Browser", type = "operation",
description = "Close Browser in Digital Display") description = "Close Browser in Digital Display")
public void closeBrowser(@HeaderParam("deviceId") String deviceId, public void closeBrowser(@HeaderParam("deviceId") String deviceId,
@HeaderParam("owner") String owner, @HeaderParam("owner") String owner,
@ -134,7 +134,7 @@ public class DigitalDisplayControllerService {
*/ */
@Path("/terminate-display") @Path("/terminate-display")
@POST @POST
@Feature(code = "DISPLAY_TERMINATE", name = "Terminate Display", @Feature(code = "DISPLAY_TERMINATE", name = "Terminate Display", type = "operation",
description = "Terminate all running processe in Digital Display") description = "Terminate all running processe in Digital Display")
public void terminateDisplay(@HeaderParam("deviceId") String deviceId, public void terminateDisplay(@HeaderParam("deviceId") String deviceId,
@HeaderParam("owner") String owner, @HeaderParam("owner") String owner,
@ -166,7 +166,7 @@ public class DigitalDisplayControllerService {
*/ */
@Path("/restart-display") @Path("/restart-display")
@POST @POST
@Feature(code = "DISPLAY_RESTART", name = "Restart Display", @Feature(code = "DISPLAY_RESTART", name = "Restart Display", type = "operation",
description = "Restart Digital Display") description = "Restart Digital Display")
public void restartDisplay(@HeaderParam("deviceId") String deviceId, public void restartDisplay(@HeaderParam("deviceId") String deviceId,
@HeaderParam("owner") String owner, @HeaderParam("owner") String owner,
@ -201,7 +201,7 @@ public class DigitalDisplayControllerService {
*/ */
@Path("/edit-content") @Path("/edit-content")
@POST @POST
@Feature(code = "DISPLAY_EDITCONTENT", name = "Edit Content", @Feature(code = "DISPLAY_EDITCONTENT", name = "Edit Content", type = "operation",
description = "Search through the sequence and edit requested resource in Digital Display") description = "Search through the sequence and edit requested resource in Digital Display")
public void editContent(@HeaderParam("deviceId") String deviceId, public void editContent(@HeaderParam("deviceId") String deviceId,
@HeaderParam("owner") String owner, @HeaderParam("owner") String owner,
@ -240,7 +240,7 @@ public class DigitalDisplayControllerService {
*/ */
@Path("/add-resource") @Path("/add-resource")
@POST @POST
@Feature(code = "DISPLAY_ADDRESOURCE", name = "Add Resource", @Feature(code = "DISPLAY_ADDRESOURCE", name = "Add Resource", type = "operation",
description = "Add new resource end to the existing sequence in Digital Display") description = "Add new resource end to the existing sequence in Digital Display")
public void addNewResource(@HeaderParam("deviceId") String deviceId, public void addNewResource(@HeaderParam("deviceId") String deviceId,
@HeaderParam("owner") String owner, @HeaderParam("owner") String owner,
@ -280,7 +280,7 @@ public class DigitalDisplayControllerService {
*/ */
@Path("/add-resource-before") @Path("/add-resource-before")
@POST @POST
@Feature(code = "DISPLAY_ADDRESOURCE_BEFORE", name = "Add Resource Before", @Feature(code = "DISPLAY_ADDRESOURCE_BEFORE", name = "Add Resource Before", type = "operation",
description = "Add new resource to sequence before given page no. in Digital Display") description = "Add new resource to sequence before given page no. in Digital Display")
public void addNewResourceBefore(@HeaderParam("deviceId") String deviceId, public void addNewResourceBefore(@HeaderParam("deviceId") String deviceId,
@HeaderParam("owner") String owner, @HeaderParam("owner") String owner,
@ -323,7 +323,7 @@ public class DigitalDisplayControllerService {
*/ */
@Path("/add-resource-next") @Path("/add-resource-next")
@POST @POST
@Feature(code = "DISPLAY_ADDRESOURCE_NEXT", name = "Add Resource Next", @Feature(code = "DISPLAY_ADDRESOURCE_NEXT", name = "Add Resource Next", type = "operation",
description = "Add new resource to sequence after given page in Digital Display") description = "Add new resource to sequence after given page in Digital Display")
public void addNewResourceAfter(@HeaderParam("deviceId") String deviceId, public void addNewResourceAfter(@HeaderParam("deviceId") String deviceId,
@HeaderParam("owner") String owner, @HeaderParam("owner") String owner,
@ -362,7 +362,7 @@ public class DigitalDisplayControllerService {
*/ */
@Path("/remove-resource") @Path("/remove-resource")
@POST @POST
@Feature(code = "DISPLAY_REMOVE_RESOURCE", name = "Remove Resource", @Feature(code = "DISPLAY_REMOVE_RESOURCE", name = "Remove Resource", type = "operation",
description = "Delete a resource from sequence in Digital Display") description = "Delete a resource from sequence in Digital Display")
public void removeResource(@HeaderParam("deviceId") String deviceId, public void removeResource(@HeaderParam("deviceId") String deviceId,
@HeaderParam("owner") String owner, @HeaderParam("owner") String owner,
@ -397,7 +397,7 @@ public class DigitalDisplayControllerService {
*/ */
@Path("/remove-directory") @Path("/remove-directory")
@POST @POST
@Feature(code = "DISPLAY_REMOVE_DIR", name = "Remove Directory", @Feature(code = "DISPLAY_REMOVE_DIR", name = "Remove Directory", type = "operation",
description = "Remove directory and whole content in Digital Display") description = "Remove directory and whole content in Digital Display")
public void removeDirectory(@FormParam("directory-name") String directoryName, public void removeDirectory(@FormParam("directory-name") String directoryName,
@HeaderParam("deviceId") String deviceId, @HeaderParam("deviceId") String deviceId,
@ -432,7 +432,7 @@ public class DigitalDisplayControllerService {
*/ */
@Path("/remove-content") @Path("/remove-content")
@POST @POST
@Feature(code = "DISPLAY_REMOVE_CONTENT", name = "Remove Content", @Feature(code = "DISPLAY_REMOVE_CONTENT", name = "Remove Content", type = "operation",
description = "Remove content from www folder in Digital Display") description = "Remove content from www folder in Digital Display")
public void removeContent(@FormParam("directory-name") String directoryName, public void removeContent(@FormParam("directory-name") String directoryName,
@FormParam("content") String content, @FormParam("content") String content,
@ -466,7 +466,7 @@ public class DigitalDisplayControllerService {
*/ */
@Path("/shutdown-display") @Path("/shutdown-display")
@POST @POST
@Feature(code = "DISPLAY_SHUTDOWN", name = "Shut Down", @Feature(code = "DISPLAY_SHUTDOWN", name = "Shut Down", type = "operation",
description = "Stop specific display in Digital Display") description = "Stop specific display in Digital Display")
public void shutDownDisplay(@HeaderParam("deviceId") String deviceId, public void shutDownDisplay(@HeaderParam("deviceId") String deviceId,
@HeaderParam("owner") String owner, @HeaderParam("owner") String owner,
@ -498,7 +498,7 @@ public class DigitalDisplayControllerService {
*/ */
@Path("/get-status") @Path("/get-status")
@POST @POST
@Feature(code = "DISPLAY_GET_STATUS", name = "Get Status", @Feature(code = "DISPLAY_GET_STATUS", name = "Get Status", type = "operation",
description = "Check specific digital display power ON of OFF") description = "Check specific digital display power ON of OFF")
public void getStatus(@HeaderParam("deviceId") String deviceId, public void getStatus(@HeaderParam("deviceId") String deviceId,
@HeaderParam("owner") String owner, @HeaderParam("owner") String owner,

2
components/device-mgt-iot-droneanalyzer/org.wso2.carbon.device.mgt.iot.droneanalyzer.api/src/main/java/org/wso2/carbon/device/mgt/iot/droneanalyzer/service/DroneService.java
Unescape View File

@ -381,7 +381,7 @@ public class DroneService {
@Path("controller/send_command") @Path("controller/send_command")
@POST @POST
@Feature( code="DRONE_SEND_COMMAND", name="Send Command", @Feature( code="DRONE_SEND_COMMAND", name="Send Command", type = "operation",
description="Send Commands to Drone") description="Send Commands to Drone")
public Response droneController(@QueryParam("owner") String owner, @QueryParam("deviceId") String deviceId, public Response droneController(@QueryParam("owner") String owner, @QueryParam("deviceId") String deviceId,
@QueryParam("action") String action, @QueryParam("duration") String duration, @QueryParam("action") String action, @QueryParam("duration") String duration,

Write Preview
Loading…
Cancel
Save