Commit 757eef1cfa64d0e982bb2f0a9701faf187af882c
1 parent
b2ad67d3
Fixed constants for edge assing/unassign
Showing
6 changed files
with
12 additions
and
12 deletions
| @@ -542,7 +542,7 @@ public class AssetController extends BaseController { | @@ -542,7 +542,7 @@ public class AssetController extends BaseController { | ||
| 542 | notes = "Creates assignment of an existing asset to an instance of The Edge. " + | 542 | notes = "Creates assignment of an existing asset to an instance of The Edge. " + |
| 543 | EDGE_ASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + | 543 | EDGE_ASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + |
| 544 | "Second, remote edge service will receive a copy of assignment asset " + | 544 | "Second, remote edge service will receive a copy of assignment asset " + |
| 545 | - EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION + ". " + | 545 | + EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION + |
| 546 | "Third, once asset will be delivered to edge service, it's going to be available for usage on remote edge instance.", | 546 | "Third, once asset will be delivered to edge service, it's going to be available for usage on remote edge instance.", |
| 547 | produces = MediaType.APPLICATION_JSON_VALUE) | 547 | produces = MediaType.APPLICATION_JSON_VALUE) |
| 548 | @PreAuthorize("hasAuthority('TENANT_ADMIN')") | 548 | @PreAuthorize("hasAuthority('TENANT_ADMIN')") |
| @@ -582,7 +582,7 @@ public class AssetController extends BaseController { | @@ -582,7 +582,7 @@ public class AssetController extends BaseController { | ||
| 582 | notes = "Clears assignment of the asset to the edge. " + | 582 | notes = "Clears assignment of the asset to the edge. " + |
| 583 | EDGE_UNASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + | 583 | EDGE_UNASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + |
| 584 | "Second, remote edge service will receive an 'unassign' command to remove asset " + | 584 | "Second, remote edge service will receive an 'unassign' command to remove asset " + |
| 585 | - EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION + ". " + | 585 | + EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION + |
| 586 | "Third, once 'unassign' command will be delivered to edge service, it's going to remove asset locally.", | 586 | "Third, once 'unassign' command will be delivered to edge service, it's going to remove asset locally.", |
| 587 | produces = MediaType.APPLICATION_JSON_VALUE) | 587 | produces = MediaType.APPLICATION_JSON_VALUE) |
| 588 | @PreAuthorize("hasAuthority('TENANT_ADMIN')") | 588 | @PreAuthorize("hasAuthority('TENANT_ADMIN')") |
| @@ -129,9 +129,9 @@ public class ControllerConstants { | @@ -129,9 +129,9 @@ public class ControllerConstants { | ||
| 129 | protected static final String EVENT_END_TIME_DESCRIPTION = "Timestamp. Events with creation time after it won't be queried."; | 129 | protected static final String EVENT_END_TIME_DESCRIPTION = "Timestamp. Events with creation time after it won't be queried."; |
| 130 | 130 | ||
| 131 | protected static final String EDGE_UNASSIGN_ASYNC_FIRST_STEP_DESCRIPTION = "Unassignment works in async way - first, 'unassign' notification event pushed to edge queue on platform. "; | 131 | protected static final String EDGE_UNASSIGN_ASYNC_FIRST_STEP_DESCRIPTION = "Unassignment works in async way - first, 'unassign' notification event pushed to edge queue on platform. "; |
| 132 | - protected static final String EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION = "(Edge will receive this instantly, if it's currently connected, or once it's going to be connected to platform)"; | 132 | + protected static final String EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION = "(Edge will receive this instantly, if it's currently connected, or once it's going to be connected to platform). "; |
| 133 | protected static final String EDGE_ASSIGN_ASYNC_FIRST_STEP_DESCRIPTION = "Assignment works in async way - first, notification event pushed to edge service queue on platform. "; | 133 | protected static final String EDGE_ASSIGN_ASYNC_FIRST_STEP_DESCRIPTION = "Assignment works in async way - first, notification event pushed to edge service queue on platform. "; |
| 134 | - protected static final String EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION = "(Edge will receive this instantly, if it's currently connected, or once it's going to be connected to platform)"; | 134 | + protected static final String EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION = "(Edge will receive this instantly, if it's currently connected, or once it's going to be connected to platform). "; |
| 135 | 135 | ||
| 136 | protected static final String MARKDOWN_CODE_BLOCK_START = "```json\n"; | 136 | protected static final String MARKDOWN_CODE_BLOCK_START = "```json\n"; |
| 137 | protected static final String MARKDOWN_CODE_BLOCK_END = "\n```"; | 137 | protected static final String MARKDOWN_CODE_BLOCK_END = "\n```"; |
| @@ -830,7 +830,7 @@ public class DashboardController extends BaseController { | @@ -830,7 +830,7 @@ public class DashboardController extends BaseController { | ||
| 830 | notes = "Creates assignment of an existing dashboard to an instance of The Edge. " + | 830 | notes = "Creates assignment of an existing dashboard to an instance of The Edge. " + |
| 831 | EDGE_ASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + | 831 | EDGE_ASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + |
| 832 | "Second, remote edge service will receive a copy of assignment dashboard " + | 832 | "Second, remote edge service will receive a copy of assignment dashboard " + |
| 833 | - EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION + ". " + | 833 | + EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION + |
| 834 | "Third, once dashboard will be delivered to edge service, it's going to be available for usage on remote edge instance." + | 834 | "Third, once dashboard will be delivered to edge service, it's going to be available for usage on remote edge instance." + |
| 835 | TENANT_AUTHORITY_PARAGRAPH, | 835 | TENANT_AUTHORITY_PARAGRAPH, |
| 836 | produces = MediaType.APPLICATION_JSON_VALUE) | 836 | produces = MediaType.APPLICATION_JSON_VALUE) |
| @@ -871,7 +871,7 @@ public class DashboardController extends BaseController { | @@ -871,7 +871,7 @@ public class DashboardController extends BaseController { | ||
| 871 | notes = "Clears assignment of the dashboard to the edge. " + | 871 | notes = "Clears assignment of the dashboard to the edge. " + |
| 872 | EDGE_UNASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + | 872 | EDGE_UNASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + |
| 873 | "Second, remote edge service will receive an 'unassign' command to remove dashboard " + | 873 | "Second, remote edge service will receive an 'unassign' command to remove dashboard " + |
| 874 | - EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION + ". " + | 874 | + EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION + |
| 875 | "Third, once 'unassign' command will be delivered to edge service, it's going to remove dashboard locally." + | 875 | "Third, once 'unassign' command will be delivered to edge service, it's going to remove dashboard locally." + |
| 876 | TENANT_AUTHORITY_PARAGRAPH, | 876 | TENANT_AUTHORITY_PARAGRAPH, |
| 877 | produces = MediaType.APPLICATION_JSON_VALUE) | 877 | produces = MediaType.APPLICATION_JSON_VALUE) |
| @@ -852,7 +852,7 @@ public class DeviceController extends BaseController { | @@ -852,7 +852,7 @@ public class DeviceController extends BaseController { | ||
| 852 | notes = "Creates assignment of an existing device to an instance of The Edge. " + | 852 | notes = "Creates assignment of an existing device to an instance of The Edge. " + |
| 853 | EDGE_ASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + | 853 | EDGE_ASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + |
| 854 | "Second, remote edge service will receive a copy of assignment device " + | 854 | "Second, remote edge service will receive a copy of assignment device " + |
| 855 | - EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION + ". " + | 855 | + EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION + |
| 856 | "Third, once device will be delivered to edge service, it's going to be available for usage on remote edge instance." + TENANT_AUTHORITY_PARAGRAPH, | 856 | "Third, once device will be delivered to edge service, it's going to be available for usage on remote edge instance." + TENANT_AUTHORITY_PARAGRAPH, |
| 857 | produces = MediaType.APPLICATION_JSON_VALUE) | 857 | produces = MediaType.APPLICATION_JSON_VALUE) |
| 858 | @PreAuthorize("hasAuthority('TENANT_ADMIN')") | 858 | @PreAuthorize("hasAuthority('TENANT_ADMIN')") |
| @@ -895,7 +895,7 @@ public class DeviceController extends BaseController { | @@ -895,7 +895,7 @@ public class DeviceController extends BaseController { | ||
| 895 | notes = "Clears assignment of the device to the edge. " + | 895 | notes = "Clears assignment of the device to the edge. " + |
| 896 | EDGE_UNASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + | 896 | EDGE_UNASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + |
| 897 | "Second, remote edge service will receive an 'unassign' command to remove device " + | 897 | "Second, remote edge service will receive an 'unassign' command to remove device " + |
| 898 | - EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION + ". " + | 898 | + EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION + |
| 899 | "Third, once 'unassign' command will be delivered to edge service, it's going to remove device locally." + TENANT_AUTHORITY_PARAGRAPH, | 899 | "Third, once 'unassign' command will be delivered to edge service, it's going to remove device locally." + TENANT_AUTHORITY_PARAGRAPH, |
| 900 | produces = MediaType.APPLICATION_JSON_VALUE) | 900 | produces = MediaType.APPLICATION_JSON_VALUE) |
| 901 | @PreAuthorize("hasAuthority('TENANT_ADMIN')") | 901 | @PreAuthorize("hasAuthority('TENANT_ADMIN')") |
| @@ -711,7 +711,7 @@ public class EntityViewController extends BaseController { | @@ -711,7 +711,7 @@ public class EntityViewController extends BaseController { | ||
| 711 | notes = "Creates assignment of an existing entity view to an instance of The Edge. " + | 711 | notes = "Creates assignment of an existing entity view to an instance of The Edge. " + |
| 712 | EDGE_ASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + | 712 | EDGE_ASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + |
| 713 | "Second, remote edge service will receive a copy of assignment entity view " + | 713 | "Second, remote edge service will receive a copy of assignment entity view " + |
| 714 | - EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION + ". " + | 714 | + EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION + |
| 715 | "Third, once entity view will be delivered to edge service, it's going to be available for usage on remote edge instance.", | 715 | "Third, once entity view will be delivered to edge service, it's going to be available for usage on remote edge instance.", |
| 716 | produces = MediaType.APPLICATION_JSON_VALUE) | 716 | produces = MediaType.APPLICATION_JSON_VALUE) |
| 717 | @PreAuthorize("hasAuthority('TENANT_ADMIN')") | 717 | @PreAuthorize("hasAuthority('TENANT_ADMIN')") |
| @@ -748,7 +748,7 @@ public class EntityViewController extends BaseController { | @@ -748,7 +748,7 @@ public class EntityViewController extends BaseController { | ||
| 748 | notes = "Clears assignment of the entity view to the edge. " + | 748 | notes = "Clears assignment of the entity view to the edge. " + |
| 749 | EDGE_UNASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + | 749 | EDGE_UNASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + |
| 750 | "Second, remote edge service will receive an 'unassign' command to remove entity view " + | 750 | "Second, remote edge service will receive an 'unassign' command to remove entity view " + |
| 751 | - EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION + ". " + | 751 | + EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION + |
| 752 | "Third, once 'unassign' command will be delivered to edge service, it's going to remove entity view locally.", | 752 | "Third, once 'unassign' command will be delivered to edge service, it's going to remove entity view locally.", |
| 753 | produces = MediaType.APPLICATION_JSON_VALUE) | 753 | produces = MediaType.APPLICATION_JSON_VALUE) |
| 754 | @PreAuthorize("hasAuthority('TENANT_ADMIN')") | 754 | @PreAuthorize("hasAuthority('TENANT_ADMIN')") |
| @@ -602,7 +602,7 @@ public class RuleChainController extends BaseController { | @@ -602,7 +602,7 @@ public class RuleChainController extends BaseController { | ||
| 602 | notes = "Creates assignment of an existing rule chain to an instance of The Edge. " + | 602 | notes = "Creates assignment of an existing rule chain to an instance of The Edge. " + |
| 603 | EDGE_ASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + | 603 | EDGE_ASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + |
| 604 | "Second, remote edge service will receive a copy of assignment rule chain " + | 604 | "Second, remote edge service will receive a copy of assignment rule chain " + |
| 605 | - EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION + ". " + | 605 | + EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION + |
| 606 | "Third, once rule chain will be delivered to edge service, it's going to start processing messages locally. " + | 606 | "Third, once rule chain will be delivered to edge service, it's going to start processing messages locally. " + |
| 607 | "\n\nOnly rule chain with type 'EDGE' can be assigned to edge." + TENANT_AUTHORITY_PARAGRAPH, | 607 | "\n\nOnly rule chain with type 'EDGE' can be assigned to edge." + TENANT_AUTHORITY_PARAGRAPH, |
| 608 | produces = MediaType.APPLICATION_JSON_VALUE) | 608 | produces = MediaType.APPLICATION_JSON_VALUE) |
| @@ -643,7 +643,7 @@ public class RuleChainController extends BaseController { | @@ -643,7 +643,7 @@ public class RuleChainController extends BaseController { | ||
| 643 | notes = "Clears assignment of the rule chain to the edge. " + | 643 | notes = "Clears assignment of the rule chain to the edge. " + |
| 644 | EDGE_UNASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + | 644 | EDGE_UNASSIGN_ASYNC_FIRST_STEP_DESCRIPTION + |
| 645 | "Second, remote edge service will receive an 'unassign' command to remove rule chain " + | 645 | "Second, remote edge service will receive an 'unassign' command to remove rule chain " + |
| 646 | - EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION + ". " + | 646 | + EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION + |
| 647 | "Third, once 'unassign' command will be delivered to edge service, it's going to remove rule chain locally." + TENANT_AUTHORITY_PARAGRAPH, | 647 | "Third, once 'unassign' command will be delivered to edge service, it's going to remove rule chain locally." + TENANT_AUTHORITY_PARAGRAPH, |
| 648 | produces = MediaType.APPLICATION_JSON_VALUE) | 648 | produces = MediaType.APPLICATION_JSON_VALUE) |
| 649 | @PreAuthorize("hasAuthority('TENANT_ADMIN')") | 649 | @PreAuthorize("hasAuthority('TENANT_ADMIN')") |