Commit Graph

1378 Commits

Author SHA1 Message Date
Gaurav
894e9dc3cf Merge branch 'master' into feature_enable_push_in_deployment_view 2016-08-09 13:15:24 +02:00
Michael Hirsch
4baf8c6ce0 Merge pull request #267 from bsinno/fix_concurrency_on_UI_causes_NullpointerException
Fix concurrency on ui causes nullpointer exception
2016-08-09 11:51:14 +02:00
Michael Hirsch
df315bb42c remove tagToken from map
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-09 11:50:59 +02:00
Michael Hirsch
9cb1fe170b clear tagDetails in BulkUpload
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-09 11:50:18 +02:00
Michael Hirsch
c4c205ea27 Merge pull request #262 from bsinno/fix_enable_showing_errors_during_bulk_upload
Fix enable showing errors during bulk upload
2016-08-08 16:47:43 +02:00
Michael Hirsch
f4c642b401 Merge pull request #265 from bsinno/fix_concurrency_on_UI_causes_NullpointerException
clear the tagDetails map as well
2016-08-08 16:21:17 +02:00
Jonathan Philip Knoblauch
8a1207337b Changed buildNotification method that error log dosn't have to be displayed in all cases
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-08 16:15:55 +02:00
Michael Hirsch
adafaa9489 clear the tagDetails map as well
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-08 16:15:15 +02:00
Gaurav
8fa2a60a71 Formatted the code.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-08 13:30:16 +02:00
Gaurav
1afd98e157 Merge branch 'feature_enable_push_in_deployment_view' of https://github.com/bsinno/hawkbit/ into feature_enable_push_in_deployment_view 2016-08-08 13:25:13 +02:00
Gaurav
e42f8164a8 Incorporated the review comments.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-08 13:24:12 +02:00
Michael Hirsch
b3702672a3 add javadoc
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-08 09:14:48 +02:00
Michael Hirsch
c4b0bdfa86 Merge pull request #264 from bsinno/fix_concurrency_on_UI_causes_NullpointerException
Fix for the concurrency issue on UI causes on the Nullpointer Exception.
2016-08-08 08:49:21 +02:00
Michael Hirsch
d53517a0c9 Merge pull request #263 from bsinno/fix_entity_lock_exception_for_unassign_soft_module_from_DS
Fix entity lock exception for unassign soft module from ds
2016-08-08 08:46:39 +02:00
Michael Hirsch
06b361ea3c Merge pull request #261 from bsinno/fix_systemmanagement_security_annotation
Fix systemmanagement security annotation
2016-08-08 08:34:09 +02:00
Gaurav
88c1253f66 Fix for the concurrency issue on UI causes on the Nullpointer Exception.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-05 16:02:20 +02:00
Jonathan Philip Knoblauch
f3f9dbc665 Added method to sync after upload
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-05 13:50:46 +02:00
Michael Hirsch
431143133b fix license header
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-05 13:19:29 +02:00
Michael Hirsch
1e00439f3c add new line
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-05 13:13:46 +02:00
Michael Hirsch
cf0ed6d828 remove guava from test dependencies
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-05 13:09:24 +02:00
Michael Hirsch
06f64da6d5 refactor test using ClassPath from guava
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-05 13:04:56 +02:00
Jonathan Philip Knoblauch
89605b0984 Changed error and how it is connected to current page
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-05 12:42:03 +02:00
Gaurav
9bd47a5c55 Added the message in the message.properties.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-05 10:49:24 +02:00
Gaurav
9de4a8de69 Merge branch
'fix_entity_lock_exception_for_unassign_soft_module_from_DS' of
https://github.com/bsinno/hawkbit/ into
fix_entity_lock_exception_for_unassign_soft_module_from_DS


Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-04 18:00:10 +02:00
Gaurav
f964f7c0c6 Formatted the code
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-04 17:58:29 +02:00
Gaurav
582ac22678 Formatted the code 2016-08-04 17:44:13 +02:00
Gaurav
303a668f16 Fix for the entity lock exception for unassign soft module from DS
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-04 17:36:28 +02:00
Jonathan Philip Knoblauch
709ea990df Removed component that was not needed
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-04 16:19:35 +02:00
Jonathan Philip Knoblauch
11bb282699 Refactoring for button enable
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-04 15:57:20 +02:00
Jonathan Philip Knoblauch
6be3d72a5a changed connector for error
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-04 13:57:06 +02:00
Michael Hirsch
f5d9cf19bb return type is not used, method can be void
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-04 13:30:53 +02:00
Michael Hirsch
b1b9716cc5 refactor test code
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-04 12:41:13 +02:00
Michael Hirsch
038538f89a extract to meanful method
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-04 12:26:28 +02:00
Jonathan Philip Knoblauch
cad916c1d7 Refactoring of bulk upload
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-04 10:04:08 +02:00
Michael Hirsch
a12b10cd14 fix license header
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-04 08:51:30 +02:00
Jonathan Philip Knoblauch
5beb10b8db Removed uiNotification
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-03 17:51:52 +02:00
Jonathan Philip Knoblauch
43f71cc976 Catch RuntimeException and handle with Vaadin error handler
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-03 17:31:46 +02:00
Michael Hirsch
cd39f32c21 fix unit test
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-03 09:49:57 +02:00
Michael Hirsch
fca7ecbce4 fix unit test
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-03 09:32:10 +02:00
Michael Hirsch
2965c93083 fix unit test
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-03 09:24:28 +02:00
Michael Hirsch
2ba9fd135d Add missing PreAuthorize annotation to secure methods and write unit
test

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-03 09:08:03 +02:00
Gaurav
0854d023fb Fixed the code for the create ds for deployment view and fixed the issue
for delete metadata(getting optimistic lock exception)
2016-08-02 18:32:44 +02:00
Michael Hirsch
041dd3bb7a don't allow anonymous login on rest-api
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-02 14:05:24 +02:00
Michael Hirsch
9c75ae308d reduce usage of getTenantMetadata(String)
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-02 13:01:31 +02:00
Michael Hirsch
fc4747083c Use system role where necessary to invoke the getTenantMetadata method
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-02 12:51:08 +02:00
Gaurav
1bf91372ae Added the javadoc. 2016-08-01 17:51:34 +02:00
Michael Hirsch
9994d7c12a Merge branch 'master' of local repository into fix_systemmanagement_security_annotation 2016-08-01 17:25:24 +02:00
Gaurav
fa3b5d69e9 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-08-01 17:25:19 +02:00
Michael Hirsch
046ec2b2ec add preauthorize to system management
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-01 17:22:21 +02:00
Michael Hirsch
30a88cc8f6 Merge pull request #259 from bsinno/feature_beautify_error_notifications
Beautify error notifications
2016-08-01 17:21:10 +02:00