Commit Graph

245 Commits

Author SHA1 Message Date
Nonnenmacher Fabian (INST-ICM/BSV-AS)
05ce99bf3d Added missing Headers, removed @Auther comment
Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:19:28 +01:00
Nonnenmacher Fabian (INST-ICM/BSV-AS)
d183322522 Changed caption from checkbox to tooltip
Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:19:13 +01:00
Michael Hirsch
4ca1bdf9ef fix tests by setting the SystemSecurityContext to prevent NPE in tests
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-29 13:19:08 +01:00
Fabian Nonnenmacher
2be4922615 Added System Security Context as attribute to AbstractControllerAuthenticationFilter
This is necessary, because the tenant configuration methods are only accessable with specific permissions.
With the SystemSecurityContext methods can be executed as SystemRunner and therefor we can set permissions.

* updated the chaine of condtructors to set the context in the filter class
* added SystemRunner permission to TenantConfigurationManagement
* Autowired the system context to AMQP and HTTP controller

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:18:58 +01:00
Fabian Nonnenmacher
57e040aec1 Fixup merge conflict
Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:18:42 +01:00
Fabian Nonnenmacher
016350de4e Moved SystemManagementResources in other package than SystemResources
* moved classes to new package to seperate it from SystemResource
* updated references

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:18:27 +01:00
Fabian Nonnenmacher
ffa46afc7a Removed old REST api for changing configuration values
Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:18:12 +01:00
Fabian Nonnenmacher
08d4509249 Added tests for REST api
- added acceptance test for every possible methode type
- added negative tests for restcalls which leads to bad requests

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:17:56 +01:00
Fabian Nonnenmacher
aee254244a Smaller Improvements of configuration REST-API
* changed resource path to "rest/v1/system/configs"
* added links to resources, to follow good practice recommendations
* added GET methode for parent resource system/configs
* fade out null values in json
* marked some json properties as mandatory

TMP

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:17:41 +01:00
Fabian Nonnenmacher
c39753001e Bugfix: Setting and getting configuration values
- removed cache from global getter, because it was overriding the cache of
  the tenant specific getter
- changed Type of AuthName key, type of key was not important before the huge
  configuration refactoring
- fixed test conditions

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:17:28 +01:00
Fabian Nonnenmacher
6a88f2a3f4 Added Permission for TenantConfiguration changes
- created SpringEvalExpression for the right to change tenant configuration
- added this authorization filter to every tenant configuration related method

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:17:13 +01:00
Fabian Nonnenmacher
ec79e9bd19 Added REST interfaces for tenant configuration
- added GET, DELETE and PUT function on configuration value interfaces
- changed Exception in TenantConfigurationManagement for correct mapping to HTTP Status
- added function to get global configurations from TenantConfigurationManagement, to have
  only one class for handling these configuration values

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:16:57 +01:00
Fabian Nonnenmacher
4be880587a Added validation before saving TenantConfiguration and updated tests
* run the validation methodes inside the storing methode, to make sure that only
  valid values are written inside the database
* updated TenantConfigurationManagementTest to match the validation
* added new Tests to test all validators

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:16:42 +01:00
Fabian Nonnenmacher
d83286c94a Changed validation method to throw exception/SpServerError
* changed error handling from return value to throw exceptions, to give the user a feedback what was wrong
* added ValidationException to ResponseExceptionHandler, to map the correct REST status codes

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:16:27 +01:00
Fabian Nonnenmacher
a5a0dc17f6 Removed PollConfigurationHelper and not used Exceptions
- removed PollConfigurationHelper and coresspending test, because it was replaced by TenantConfigurationManagement
- removed very specific configuration exceptions, because they are not needed anymore

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:16:13 +01:00
Fabian Nonnenmacher
49486755b2 Revert "changed datamodel, integrated poll configuration into tenant meta data table"
This reverts commit 9d147aada710cc2333723604fa8893e4f2f0515f.

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>

Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/TenantMetaData.java
2016-02-29 13:15:59 +01:00
Fabian Nonnenmacher
6cef6aed1a Moved tenant configuration functions to new management class
- moved fucntions to TenantConfigurationManagement, for better function capseling
- updated references
- updated references in tests, tests were succesfully

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:15:40 +01:00
Fabian Nonnenmacher
b56477191a Added generic validator fucntion to TenantConfigurationKey
Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:15:27 +01:00
Fabian Nonnenmacher
3f2c0d134a Updated UI to use new database structure
* use new methods to store polling Configuration
* refactored DurationConfigField, added Builder

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:15:14 +01:00
Fabian Nonnenmacher
07fce42469 Changed return type of SystemManagement.getConfigurationValue()
* changed Return type to wrapper object, adding additional meta data stored in the database
* updated all calls of this method
* updated function calls in tests
* verified correct execution of correspending tests

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:15:03 +01:00
Fabian Nonnenmacher
f2e7cdb92a Updated TenantConfigurationKey
* added DataType of stored Value as attribute
* added Polling keys to Enum

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:14:46 +01:00
Fabian Nonnenmacher
f3fa085c62 First implemtation of REST-API
Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:14:36 +01:00
Fabian Nonnenmacher
088df73ea9 Refactoring of buisness logic
* added DurationHelper to have access to Convertion in every class
* removed tenant specific getter and setter from PollConfigurationHelper
* changed getter and setter in TenantMetaData to use DurationObjects instead of Strings
* updated UI to call new functions
* updated module tests

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:14:21 +01:00
Fabian Nonnenmacher
4675ebf22c Refactoring of Authentification UI
* modified AuthentificationUI to use same Interface as Polling Configuration UI
* renaming of Interface "ConfigurationElement" -> "ConfigurationItem"

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:14:05 +01:00
Fabian Nonnenmacher
3f451537cf Added tests for PollConfigurationHelper
Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:13:44 +01:00
Fabian Nonnenmacher
cb3e6863c1 Updated UI to handle all requirements
* added DurationConfigField (Field which contains a DurationConfigField and a Checkbox)
* added labels to messages.properties
* added new Interface ConfigurationElement, with functionallity which is important for saving the data

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:13:31 +01:00
Fabian Nonnenmacher
1eedd3a531 Implemented Buisnesslogic to read and save correct polling configuration
- added min and max values to config files
- updated ControllerPollProperties: added getter and setter of min and max values
- updated PollConfigurationHelper: added getter for different values

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:13:12 +01:00
Fabian Nonnenmacher
07e0fb3032 First Implemantation of Configuration Logic
Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:09:33 +01:00
Fabian Nonnenmacher
1f9c6bfd72 Changed datamodel, integrated poll configuration into tenant meta data table
* updated sql scripts to update new collums
* updated coressponding JPA class TenantMetaData

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:09:19 +01:00
Fabian Nonnenmacher
acc0770d36 Changed stylesheet to disable calender in popup of DurationField.
* calender popup should only show the time selector, because the modified DurationField only uses this value

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:08:58 +01:00
Fabian Nonnenmacher
ee1aabc93f Added subview for polling configuration in system configuration window
* updated architectural concept os subview
** added base class BaseConfigurationView
** updated interface ConfigurationGroup
* updated message strings for new pollign configurations
* implemented new vaadin compontent DurationField (extends DateTimeField)

TODO:
* update positioning of DurationFields
* update validation of user input, espacilly against min and max value

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:08:43 +01:00
Kai Zimmermann
7e2ad9fc4a Merge pull request #53 from bsinno/Artifiact_upload_directory_upload
👍 merged
2016-02-27 15:35:40 +01:00
asharani-murugesh
80366b03be Review comments addresses
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-27 09:24:18 +01:00
Kai Zimmermann
e95acec956 Merge pull request #52 from bsinno/REFACTORING_CLEAN_CODE_PART_2
👍 merged
2016-02-26 09:50:43 +01:00
asharani-murugesh
92811f1a22 review comment addressed
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-26 08:47:21 +01:00
asharani-murugesh
b8ed510e8a reset the has directory flag
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-25 17:54:50 +01:00
asharani-murugesh
0b5c0673b1 fix
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-25 17:43:28 +01:00
asharani-murugesh
e3862cee74 Merge branch 'master' into Artifiact_upload_directory_upload 2016-02-25 17:07:20 +01:00
Michael Hirsch
07bf7e65bb Merge pull request #51 from bsinno/REFACTORING_CLEAN_CODE
ok this refactorings are aligned with the hawkbit sonar ruleset, merging.
2016-02-25 17:06:33 +01:00
Michael Hirsch
62d96a4ac6 remove static modifier from inner class
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-25 14:51:45 +01:00
Michael Hirsch
f969d6f4c2 clean code refactorings
- add description to assertions in unit tests
- make inner classes static
- remove out-commented code

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-25 14:38:25 +01:00
SirWayne
dbf03dca12 Add the "@Override" annotation
Add some description to JUnit Tests
Remove unused override comments
Remove unused javadoc on private methode

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-25 11:37:56 +01:00
SirWayne
fcd6555e3e Fix diamond operator
Remove unused override comments
Remove unused javadoc on private methode

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-24 18:24:53 +01:00
Michael Hirsch
ca66932918 Merge pull request #44 from bsinno/clearing_the_search_field_should_keep_the_focus
ok merging.
2016-02-24 14:47:30 +01:00
Michael Hirsch
0d81797ebf Merge pull request #48 from bsinno/remove-runtime-dep-sasscompiler
ok merged.
2016-02-23 15:57:43 +01:00
Michael Hirsch
275d929607 Merge pull request #49 from bsinno/update-spring-boot
ok merging.
2016-02-23 15:56:48 +01:00
Kai Zimmermann
1db0d6a5e9 Upgraded to newer jackson and hibernate validator version 2016-02-23 13:10:33 +01:00
Kai Zimmermann
6a5a3f2188 Cleaned up code 2016-02-23 11:34:36 +01:00
Kai Zimmermann
8507ae2bd3 Moved java version on top 2016-02-23 11:14:48 +01:00
Kai Zimmermann
713922d762 Remove broken spring property usage for vaadin caching 2016-02-22 12:21:14 +01:00