Commit Graph

173 Commits

Author SHA1 Message Date
Kai Zimmermann
3334cf4a64 Updated test
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-02-17 08:36:36 +01:00
Kai Zimmermann
8a14cca0a9 Merge branch 'DistributionSetAssignmentResult-consistency-fix' of https://github.com/bsinno/hawkbit.git into DistributionSetAssignmentResult-consistency-fix 2016-02-16 17:38:03 +01:00
Kai Zimmermann
6a2b74e565 Enabled target.assignedDs load through action enitygraph.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-02-16 17:37:34 +01:00
Kai Zimmermann
38b750f674 DistributionSetAssignmentResult contains actions that do not reflect the
status on the DB. Needs to be avoided by returning actions IDs only and
force the user to query an updated action entity.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-02-16 17:37:06 +01:00
Kai Zimmermann
e3801e9e56 DistributionSetAssignmentResult contains actions that do not reflect the
status on the DB. Needs to be avoided by returning actions IDs only and
force the user to query an updated action entity.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-02-16 13:48:52 +01:00
Michael Hirsch
2ef04bb437 Merge pull request #41 from bsinno/custom-target-filter-bug-fixes
👍 ok merging.
2016-02-15 13:13:30 +01:00
Michael Hirsch
7b79010fbf format sources with correct formatter.
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-15 12:32:12 +01:00
Michael Hirsch
e8a2c7566c Merge pull request #43 from bsinno/Drag_and_Drop_handles_wrong_item
👍  is ok merging.
2016-02-15 12:12:05 +01:00
Michael Hirsch
21114a731d Merge pull request #42 from bsinno/EMPTY_CONTROLLER_ID
👍 is ok merging.
2016-02-15 12:11:41 +01:00
venu1278
caad1b7a10 Merge branch 'master' into MECS-911_Drag_and_Drop_handles_wrong_item 2016-02-15 15:55:36 +05:30
asharani-murugesh
bd4d6770e2 Merge branch 'custom-target-filter-bug-fixes' of https://github.com/bsinno/hawkbit into custom-target-filter-bug-fixes 2016-02-15 10:43:19 +01:00
asharani-murugesh
a0a24376bb Revert to master copy
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-15 10:43:07 +01:00
asharani-murugesh
e64f9b5fc9 Merge branch 'master' into custom-target-filter-bug-fixes 2016-02-15 10:41:03 +01:00
asharani-murugesh
b498f60392 Reverting the changes as per master copy
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-15 10:40:30 +01:00
asharani-murugesh
158a9cfa20 RSQLUtility : convert query to lower case before parsing
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-15 10:38:30 +01:00
Michael Hirsch
8e0c345bf2 Merge pull request #40 from bsinno/clean_code_add_description_to_junit_test
👍  is ok merging.
2016-02-15 08:57:25 +01:00
asharani-murugesh
59fb97fea2 In and Out parameter changes
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-13 21:33:27 +01:00
asharani-murugesh
629ac6c4de Sonar issues fixed
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-13 12:26:46 +01:00
asharani-murugesh
aac43d346f Bug fixes:
Custom filter detail view : Using =IN= parameter throws 'Unsupported
operator' exception and breaks the UI
Custom filter search : type any query.Search never gets finished.
Alloe case insensitive search for IN paramters

Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-13 12:21:04 +01:00
Kai Zimmermann
c7254d665e Merge pull request #38 from bsinno/fix_wrong_count_select_statement_for_targetrolloutgroup
👍 ok
2016-02-12 15:57:48 +01:00
Kai Zimmermann
489c7066d7 Merge pull request #39 from bsinno/reduce_logging_of_checking_running_rollouts
👍 ok
2016-02-12 15:57:10 +01:00
Jonathan Philip Knoblauch
88c854f2be Clean code for junit tests …
- Added messages to JUnit assertions
- Added Description when missing
- Changed to assertThat when assertEquals

Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-02-12 13:47:53 +01:00
Michael Hirsch
e2927acfca reduce logging from info to debug when checking rollout
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-12 13:18:55 +01:00
Michael Hirsch
b30375e9e6 fix count select statement join is wrong
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-12 12:36:12 +01:00
Michael Hirsch
d8a0a7f8e4 fix accessing the with this causes NPE use UI.getCurrent
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-11 19:53:06 +01:00
Michael Hirsch
145ae2e6aa Merge pull request #37 from bsinno/fix_target_filter_access_ui_thread
Fix target filter access ui thread
2016-02-11 17:30:43 +01:00
Michael Hirsch
19fb5332ef fix accessing the UI thread when updating the total target label
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-11 17:07:18 +01:00
asharani-murugesh
e84b593853 Safely getting access to the UI thread to modify the target count label
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-11 13:26:57 +01:00
asharani-murugesh
fbc16a4274 Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com> 2016-02-11 12:06:44 +01:00
SirWayne
46a71c1b3a Use javax annotation for validation
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-10 16:51:45 +01:00
SirWayne
f78bd68c03 Verify that the target controller id cannot be empty
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-10 16:22:20 +01:00
Michael Hirsch
5cb1952c80 Merge remote-tracking branch 'eclipse/eclipsemaster' 2016-02-10 14:10:15 +01:00
Michael Hirsch
6a93b15854 fixing newly created bug by trying to simplify if-statement with commit
a4e1ae7ac8

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-10 12:43:54 +01:00
Michael Hirsch
ed5e985055 Merge branch 'master' of https://github.com/bsinno/hawkbit.git 2016-02-10 12:42:48 +01:00
Michael Hirsch
96bf5a8293 fixing newly created bug by trying to simplify if-statement with commit
a4e1ae7ac8

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-10 12:42:37 +01:00
venu1278
9308cdc0fd Merge branch 'master' into MECS-911_Drag_and_Drop_handles_wrong_item 2016-02-10 14:40:19 +05:30
venu1278
3479a8d692 Drag and drop handles wrong item.
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-02-10 14:35:30 +05:30
SirWayne
7e69ead138 Revert Clean Code Changes
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-10 08:47:12 +01:00
SirWayne
d685c48f52 Clean Code Refactoring
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-10 08:05:24 +01:00
Michael Hirsch
def3868ee0 Merge remote-tracking branch 'refs/remotes/eclipse/master' 2016-02-09 18:42:31 +01:00
Michael Hirsch
0eadf537cc Merge pull request #30 from bsinno/feign_mgmt_api_client
Feign mgmt api client
2016-02-09 18:41:03 +01:00
Michael Hirsch
2fa6e2c05f fix license headers
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-09 18:18:39 +01:00
Michael Hirsch
17d815e1b6 add example mgmt-api-client powered by feign and spring-cloud.
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-09 17:49:24 +01:00
Michael Hirsch
81bf2df2d8 Merge remote-tracking branch 'refs/remotes/eclipse/master' 2016-02-09 14:51:58 +01:00
Michael Hirsch
5088b7fd9b Merge pull request #21 from bsinno/MECS-1477_NPE_when_user_tries_to_create_simple_targetfilter
NPE_when_user_tries_to_create_simple_targetfilter.
2016-02-09 14:51:29 +01:00
Michael Hirsch
d24e269e13 Merge remote-tracking branch 'refs/remotes/eclipse/master' 2016-02-09 14:49:20 +01:00
Michael Hirsch
014a6f04f5 Merge pull request #29 from bsinno/Sonar_Fix_Rollout
Sonar fix rollout
2016-02-09 14:48:08 +01:00
SirWayne
b21f8f5c71 Clean Code Refactoring
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-09 13:36:58 +01:00
SirWayne
a4e1ae7ac8 Remove blocker issues
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-09 13:26:25 +01:00
Michael Hirsch
8ebaaef931 Merge remote-tracking branch 'refs/remotes/eclipse/master' 2016-02-09 12:03:04 +01:00