Commit Graph

1263 Commits

Author SHA1 Message Date
Michael Hirsch
2f263faca0 suppress warning for multiple checked exception declaration
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 12:01:28 +02:00
Michael Hirsch
7e94c9f684 write comment in constructor why necessary
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 11:58:11 +02:00
Michael Hirsch
227267af88 avoid more than 3 nested if/switch/try blocks
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 11:18:05 +02:00
Michael Hirsch
40a12c0321 remove unnecessary IOException from method signature
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 11:16:37 +02:00
Michael Hirsch
400c8bafcf move method to the right inner class
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 11:10:59 +02:00
Michael Hirsch
9727af7a99 don't use getBytes using default encoding
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 10:54:05 +02:00
Michael Hirsch
928ad1520b remove port 8080 to fix tests
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 10:39:55 +02:00
Michael Hirsch
812498d2fe don't use constructor using default encoding
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 10:22:35 +02:00
Michael Hirsch
82fa485ddc suppress warning squid:S2221
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 10:13:07 +02:00
Michael Hirsch
f3b472bcd2 Merge branch 'master' into Feature_Improve_Code_Quality
Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandlerProperties.java
	hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/eventbus/CacheFieldEntityListener.java
	hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactBeanQuery.java


Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 10:08:24 +02:00
Kai Zimmermann
0380fdf8ba Merge pull request #255 from bsinno/fix_upgrade_collections
Upgrade Apache Collections to 4.1 due to known vulnerability.
2016-07-21 12:52:35 +02:00
kaizimmerm
1c70527083 Upgrade Apache Collections to 4.1 due to known vulnerability.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-07-21 11:44:41 +02:00
Kai Zimmermann
8a4e952bdb Merge pull request #252 from bsinno/feature_upgrade_spring_amqp
Upgrade Spring AMQP to 1.6.1
2016-07-21 10:38:54 +02:00
Kai Zimmermann
6eadd6a3eb Merge pull request #251 from bsinno/feature_rsql_last_poll
Added feature to query by last target poll.
2016-07-21 10:38:09 +02:00
Michael Hirsch
adb60156f8 Merge pull request #254 from bsinno/add_hawkbit_logo_to_readme
Add hawkbit logo to readme
2016-07-21 09:39:19 +02:00
Michael Hirsch
af00f3aa1b resize image
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-21 08:32:53 +02:00
Michael Hirsch
2fe670b57f resize image
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-21 08:27:04 +02:00
Michael Hirsch
d12bd8c2db try out image tag for resize
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-21 08:26:10 +02:00
Michael Hirsch
4bc5bb2dd3 Merge pull request #253 from bsinno/fix_initial_tenant_creation
remove caching from jpa_system_management
2016-07-20 19:35:26 +02:00
Michael Hirsch
b04755eda8 remove caching from jpa_system_management
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-20 18:05:21 +02:00
Dominic Schabel
fd749a9d69 Minor review comments added.
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-07-20 18:03:28 +02:00
Michael Hirsch
5a6d656b75 add hawkbit logo to readme.md
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-20 16:51:01 +02:00
Kai Zimmermann
1ae3b4bcbb Upgrade Spring AMQP to 1.6.1
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-07-20 11:45:53 +02:00
Kai Zimmermann
2ad5d8cfb1 Added feature to query by last target poll.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-07-20 10:34:19 +02:00
Michael Hirsch
9ac4bbcc54 Merge pull request #250 from bsinno/fix_initial_tenant_creation
remove cacheable on initial tenant creation
2016-07-19 18:35:56 +02:00
Michael Hirsch
fe0a719ede remove cacheable on initial tenant creation
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-19 18:01:06 +02:00
Michael Hirsch
2411faf1f2 Merge pull request #249 from bsinno/fix_initial_tenant_creation
don't return null on isAuthenticated method is boolean
2016-07-19 16:35:30 +02:00
Michael Hirsch
d1c889bf16 don't return null on isAuthenticated method is boolean
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-19 15:51:22 +02:00
Kai Zimmermann
ba177f77c0 Merge pull request #222 from bsinno/Fix_Consistent_context_menu_on_tables
Fix consistent context menu on tables
2016-07-19 14:50:02 +02:00
Michael Hirsch
f540f4c1e2 Merge pull request #247 from bsinno/fix_initial_tenant_creation
fix invalidating correct caches when update tenant metadata
2016-07-19 13:56:51 +02:00
Michael Hirsch
cc986fe6f0 fix invalidating correct caches when update tenant metadata
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-19 13:35:47 +02:00
Kai Zimmermann
c360f01e2b Merge pull request #246 from bsinno/fix_initial_tenant_creation
Fix initial tenant creation
2016-07-19 08:36:46 +02:00
Michael Hirsch
e54ec22a83 remove the current tenant cache evict when delete tenant
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-18 13:37:33 +02:00
Michael Hirsch
ecf59fd0b6 add test description
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-18 13:05:38 +02:00
Michael Hirsch
0c2604d1a1 add unit test for initial creating tenant without security context
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-18 13:03:39 +02:00
Michael Hirsch
3b5bcd46d8 add javadoc
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-18 12:57:54 +02:00
Michael Hirsch
d2cd13996a fix initial creation of tenant when no current tenant and caching fix
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-18 12:48:50 +02:00
Kai Zimmermann
60efc6eedc Merge pull request #243 from bsinno/fix_button_color
Correct colour of cancel/save button in DialogWindows
2016-07-18 10:39:22 +02:00
Melanie Retter
40f58e4b3a Refactor methodname and method call order
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-07-15 17:46:54 +02:00
Melanie Retter
9890a1d018 Insert space between buttons and window bottom
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-07-15 17:39:51 +02:00
Melanie Retter
bcc526e891 Add colored style to action buttons
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-07-15 16:47:02 +02:00
Melanie Retter
c8f307cf33 Correct the button's style on rollout view
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-07-15 16:25:02 +02:00
Melanie Retter
0244c1ded1 Force quit is disabled if action is not forced but is canceled
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-07-15 13:34:39 +02:00
Melanie Retter
ef76488a53 Changed class name, and refactored the style logic (set / add style)
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-07-15 12:37:28 +02:00
Kai Zimmermann
015f88a54f Merge pull request #238 from bsinno/feature_traffic_tenant_stats
Traffic data in DownloadProgress event
2016-07-15 11:01:08 +02:00
Kai Zimmermann
5d3ba2a4b4 Merge pull request #241 from bsinno/bug_wrong_option_in_smtype_assign_max
Changed if statement of how we distinguish if a softwareModule type i…
2016-07-15 10:01:41 +02:00
Melanie Retter
d87aaf2141 Delete css style for default-color
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-07-14 14:48:50 +02:00
Melanie Retter
1ff13a39df Correct colour of cance/save button in CommonDialogWindow
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-07-14 14:28:23 +02:00
Melanie Retter
48561b2028 Merge remote-tracking branch 'origin/master' into
Fix_Consistent_context_menu_on_tables

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-07-13 18:07:50 +02:00
Jonathan Philip Knoblauch
7be2eea2db Changed if statement of how we distinguish if a softwareModule type is a firmware or a software
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-07-13 16:55:10 +02:00