Commit Graph

6807 Commits

Author SHA1 Message Date
Yohan Avishke
8489dec2b1 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/EventStream.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/AnalyticsArtifactsManagementServiceImpl.java
2019-10-16 07:24:03 +05:30
Yohan Avishke
51b7f8b206 Modify code to limit garbage collectible objects and create method to deploy adapters without custom mapping
Removed creation of ArrayLists when a service is been called and added null validation to those lists in service layer. Developed code to deploy adapters when custom mapping is false and updated exception handling.
2019-10-16 07:12:31 +05:30
Entgra Builder
9502ff52e6 [maven-release-plugin]prepare for next development iteration 2019-10-14 15:53:20 +00:00
Entgra Builder
35b76c1c1b [maven-release-plugin]prepare release v3.2.14 2019-10-14 15:53:13 +00:00
vinojiniparamasivam
c6d23b5e7a Change button name in add policy page 2019-10-14 17:24:22 +02:00
Entgra Builder
2fa223410c [maven-release-plugin]prepare for next development iteration 2019-10-14 12:36:11 +00:00
Entgra Builder
d8248301de [maven-release-plugin]prepare release v3.2.13 2019-10-14 12:36:01 +00:00
Dharmakeerthi Lasantha
b209ac9aa6 Update the Analytics Artifacts Management API 2019-10-14 09:35:33 +00:00
Yohan Avishke
4557c5fc5c Update the Analytics Artifacts Management API 2019-10-14 09:35:32 +00:00
Dharmakeerthi Lasantha
032746c1aa Merge branch 'master' into 'master'
Minor fixes and improvement for permanent delete devices

See merge request entgra/carbon-device-mgt!309
2019-10-13 11:16:25 +00:00
Yohan Avishke
d885707046 Refactor code in a reusable way and change response messages
Removed repeated classes and implemented code to already existing classes and divided code into sub methods to limit repetitive code and increase readability. And the response messages were change in order to give users a better understating of the responses they get when calling the api endpoints.
2019-10-13 12:37:55 +05:30
Yohan Avishke
fe4e857639 Change exception codes of device stream events 2019-10-13 12:37:55 +05:30
Yohan Avishke
e643db08d1 Change event attribute mapping logic and error handling
Event attribute mapping logic was moved to service layer from the api layer and a created a meaningful error message.
2019-10-13 12:37:55 +05:30
Yohan Avishke
da2d95e7ac Change event attribute mapping logic and error handling
Event attribute mapping logic was moved to service layer from the api layer and a created a meaningful error message.
2019-10-13 12:37:55 +05:30
Yohan Avishke
f660bf9edd Add ApiParams to all the parameters 2019-10-13 12:37:55 +05:30
Yohan Avishke
e5963c79fd Override toString 2019-10-13 12:37:55 +05:30
Saad Sahibjan
f9660de334 Minor fixes and improvement for permanent delete devices 2019-10-13 11:58:58 +05:30
Saad Sahibjan
1f907ea283 Merge branch 'delete-fix' into 'master'
Permanent delete DAO fix

## Purpose
Fix issue in deleting duplicate deviceIds from tables

## Security checks
* Followed secure coding standards? yes
* Ran FindSecurityBugs plugin and verified report? no
* Confirmed that this PR doesn't commit any keys, passwords, tokens, usernames, or other secrets? yes

See merge request entgra/carbon-device-mgt!302
2019-10-11 08:59:32 +00:00
Amanda Randombage
becaf35546 Permanent delete DAO fix 2019-10-11 08:59:31 +00:00
Dharmakeerthi Lasantha
90fd12d876 Merge branch 'delete-fix' into 'master'
Fix delete

See merge request entgra/carbon-device-mgt!300
2019-10-10 03:11:23 +00:00
Amanda
7b7d47a2bf Fix delete
- Fix delete button in UI
- Close connection in DAO
2019-10-10 07:56:29 +05:30
Entgra Builder
277b114f9c [maven-release-plugin] prepare for next development iteration 2019-10-09 10:41:21 +00:00
Entgra Builder
cd6ff02aff [maven-release-plugin] prepare release v3.2.12 2019-10-09 10:41:15 +00:00
Saad Sahibjan
ebf46f46e1 Merge branch 'permanent-delete' into 'master'
Fix Permanent delete for multiple enrollments

## Purpose
To enable permanent deletion of a sinlge device with multiple enroolmemts

## Goals
> (Goals achieved by feature)

## Approach

## Documentation

## Automation tests

## Security checks
 - Followed secure coding standards? (yes/no)
 - Ran FindSecurityBugs plugin and verified report? (yes/no)
 - Confirmed that this PR doesn't commit any keys, passwords, tokens, usernames, or other secrets? (yes/no)

## Related MRs


## Test environment

## Learning

See merge request entgra/carbon-device-mgt!296
2019-10-09 10:19:55 +00:00
Amanda Randombage
e80589d3b1 Fix Permanent delete for multiple enrollments 2019-10-09 10:19:55 +00:00
Dharmakeerthi Lasantha
1abc701f20 Add UI feature to delete multiple devices permanently 2019-10-09 08:56:32 +00:00
Amanda Randombage
8a586eee2c Add UI feature to delete multiple devices permanently 2019-10-09 08:56:32 +00:00
Dharmakeerthi Lasantha
023e162f59 Merge branch 'entgra-175' into 'master'
Fix issue with re-configuring policy

Closes product-iots#175

See merge request entgra/carbon-device-mgt!294
2019-10-09 06:55:42 +00:00
Madawa Soysa
03c550d11b Fix issue with reconfiguring policy
The cause of the issue is not passing the newly introduced parameter 'policyType' in the policy edit payload. This parameter is marked @NotNull. Hence throwing an error. 

This fix sets the policyType parameter from the existing payload (Doesn't allow to edit as there is no UI interface to edit this parameter ATM

Fixes: entgra/product-iots#175
2019-10-09 16:50:12 +11:00
Dharmakeerthi Lasantha
d98564c39b Change permanent delete HTTP method 2019-10-09 01:54:11 +00:00
Amanda Randombage
824403b97e Change permanent delete HTTP method 2019-10-09 01:54:08 +00:00
Dharmakeerthi Lasantha
d813888923 Merge branch 'retrieving-devices-fix' into 'master'
Fix issue in retrieving IoTS devices

See merge request entgra/carbon-device-mgt!290
2019-10-08 16:32:11 +00:00
Amanda
0aee974b35 Fix issue in retrieving IoTS devices 2019-10-08 17:33:24 +05:30
Entgra Builder
c1612446e4 [maven-release-plugin] prepare for next development iteration 2019-10-05 12:04:29 +00:00
Entgra Builder
3cecc16145 [maven-release-plugin] prepare release v3.2.11 2019-10-05 12:04:23 +00:00
Entgra Builder
36a91e0e62 [maven-release-plugin]prepare for next development iteration 2019-10-05 06:47:25 +00:00
Entgra Builder
d1cfd12185 [maven-release-plugin]prepare release v3.2.10 2019-10-05 06:47:19 +00:00
Entgra Builder
15b4b6ff37 [maven-release-plugin]prepare for next development iteration 2019-10-04 17:41:23 +00:00
Entgra Builder
bd6ca17381 [maven-release-plugin]prepare release v3.2.9 2019-10-04 17:41:17 +00:00
Pahansith Gunathilake
db8645e6c5 Add policy type 2019-10-03 17:26:31 +00:00
Saad Sahibjan
d683d0c93f Merge branch 'master' into 'master'
Fix incorrect device view issue for different ownerships.

Closes product-iots#135

See merge request entgra/carbon-device-mgt!273
2019-10-03 10:09:06 +00:00
lasanthaDLPDS
2d58d69d2f Fix incorrect device view issue for different ownerships. 2019-10-03 15:38:07 +05:30
Milan Perera
fe23ab711c Merge branch 'master' into 'master'
Master

Closes product-iots#172

See merge request entgra/carbon-device-mgt!267
2019-09-30 14:32:15 +00:00
milanperera
576ccd2363 Fix issues in fix-172 2019-09-30 15:54:12 +02:00
milanperera
a044bbd385 fix entgra/product-iots#172 2019-09-30 15:47:50 +02:00
Charitha Goonetilleke
4c78c1bf13 Merge branch 'master' into 'master'
Fix device-type features edit issue

See merge request entgra/carbon-device-mgt!266
2019-09-30 07:13:17 +00:00
Turcy
f28d42d7ce Fix device-type features edit issue 2019-09-30 12:14:35 +05:30
Dharmakeerthi Lasantha
6f21f472b6 Merge branch 'GroupNameCase' into 'master'
Fix Null pointer exception in group management

See merge request entgra/carbon-device-mgt!265
2019-09-27 15:46:41 +00:00
ausamriyaaz
2c27830ecc Fix Null pointer exception 2019-09-27 15:42:01 +05:30
Dharmakeerthi Lasantha
0dac130e91 Show the applied policies when click view button on policy compliance 2019-09-27 05:51:59 +00:00