Commit Graph

70 Commits

Author SHA1 Message Date
SirWayne
f5539fd607 Add a controller management api to get the polling time
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-03-14 15:54:54 +01:00
Kai Zimmermann
807aaf629c Merge remote-tracking branch 'eclipse/master' into feature_MECS-86_tenant_specific_polling_configuration
# Conflicts:
#
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/Tena
ntConfigurationDashboardView.java
2016-03-14 09:51:00 +01:00
SirWayne
ed97031faf Merge branch 'master' into
feature_MECS-86_tenant_specific_polling_configuration

Conflicts:
	hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityManagedConfiguration.java
	hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationKey.java
	hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentfication.java
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentficationTest.java
	hawkbit-repository/src/test/resources/application-test.properties


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-03-09 13:29:40 +01:00
Jonathan Philip Knoblauch
65d3b5a6b8 Added license header and fixed sonar issue: Fields and methods should not have conflicting names
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-03-09 10:54:05 +01:00
Jonathan Philip Knoblauch
8f35b75857 Removed unused target parameter in method forceQuitAction and change assertEquals to assertThat
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-03-07 14:44:34 +01:00
Kai Zimmermann
dcea53f4c8 Merge remote-tracking branch 'eclipse/master' into harmonize-test-documentation 2016-03-04 18:14:26 +01:00
Nonnenmacher Fabian (INST-ICM/BSV-AS)
9646e1eabc Fixed review findings 2016-03-04 12:34:39 +01:00
Kai Zimmermann
25832e7e16 Merge remote-tracking branch 'eclipse/master' into cleanup-properties
# Conflicts:
#
hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpProperties.j
ava
2016-03-04 12:11:35 +01:00
Kai Zimmermann
71653470dc Merge remote-tracking branch 'eclipse/master' into harmonize-test-documentation 2016-03-03 20:59:15 +01:00
Kai Zimmermann
794db18673 Added comments and changed default sorting for actions. 2016-03-03 20:46:50 +01:00
Kai Zimmermann
e7173aa846 Cleanup messed up actionstatus sorting. We used sort param but had
hardcoded sorting in the reposirory. I added also reportAt based
sorting.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-03-03 18:54:50 +01:00
Nonnenmacher Fabian (INST-ICM/BSV-AS)
0e9991b0a4 Added missing licence header
Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 14:28:44 +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
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
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
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
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
SirWayne
895a78fee8 Merge branch 'master' into Multiple_VHost_Connection
Conflicts:
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java
	hawkbit-security-core/src/test/java/org/eclipse/hawkbit/util/IpUtilTest.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-29 12:41:52 +01:00
Kai Zimmermann
3eaab83014 Merge remote-tracking branch 'eclipse/master' into cleanup-properties 2016-02-25 18:01:56 +01:00
Kai Zimmermann
ab18e12b69 Completed migration to ConfigurationProperties annotation. Added boot metadata generation to build. 2016-02-25 17:59:46 +01:00
Kai Zimmermann
0b8e693cec Migrated environment aware to property annotation mechanism, documented properties. 2016-02-25 11:36:21 +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
Kai Zimmermann
a9f91e90da Removed old issue numbers. Further documentation 2016-02-22 20:13:45 +01:00
Kai Zimmermann
b6509750bc Removed broken javadoc.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-02-18 10:22:21 +01:00
Kai Zimmermann
1c6223ba5d Improved readibility
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-02-18 10:12:36 +01:00
Kai Zimmermann
01b75fc932 Removed unnecessary entitygraph usage.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-02-17 09:57:07 +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
SirWayne
5d7ade1cf2 Add create tenant
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-15 16:20:45 +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
21114a731d Merge pull request #42 from bsinno/EMPTY_CONTROLLER_ID
👍 is ok merging.
2016-02-15 12:11:41 +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
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
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
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
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