Commit Graph

54 Commits

Author SHA1 Message Date
Kai Zimmermann
d2a95b1c7c Fixed compile error and made utility final 2016-03-15 14:05:47 +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
Kai Zimmermann
de78077920 Added check for rollout repo content after test.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-03-11 09:27:48 +01:00
Michael Hirsch
6ac4cac60f Merge pull request #78 from bsinno/fixed-wrong-filter-param
is ok merging.
2016-03-10 14:37:21 +01:00
SirWayne
e47d540eb5 Fix event listening for duration field
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-03-10 10:27:31 +01:00
Kai Zimmermann
6379e93c5e Fixed max assignments filter on sw module type 2016-03-09 19:34:28 +01:00
SirWayne
a4cc3df092 Fix test properties
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-03-09 15:36:59 +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
b54f203fad Refactored the createAndStartRolloutInAsync test
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-03-07 17:54:26 +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
SirWayne
43d01da309 Fix typo after pull request review
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-03-07 13:35:26 +01:00
SirWayne
f4791743ce Add test case description
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-03-07 12:18:18 +01:00
Kai Zimmermann
dcea53f4c8 Merge remote-tracking branch 'eclipse/master' into harmonize-test-documentation 2016-03-04 18:14:26 +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
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
SirWayne
c9c36ea435 Add description for asserts in test cases
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-29 15:34:07 +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
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
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
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
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
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
3f451537cf Added tests for PollConfigurationHelper
Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:13:44 +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
Kai Zimmermann
7692a29918 Fixed property bean setup 2016-02-25 20:36:17 +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
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
Kai Zimmermann
0b8e693cec Migrated environment aware to property annotation mechanism, documented properties. 2016-02-25 11:36:21 +01:00
Kai Zimmermann
82121766d1 Merge remote-tracking branch 'eclipse/master' into harmonize-test-documentation
# Conflicts:
#	pom.xml
2016-02-24 09:00:37 +01:00
Kai Zimmermann
7f2a9d1ed2 Features harmonised, more test descriptions 2016-02-23 09:57:18 +01:00
Kai Zimmermann
a9f91e90da Removed old issue numbers. Further documentation 2016-02-22 20:13:45 +01:00
Kai Zimmermann
13345406ee Upgraded 3rd party libs 2016-02-22 11:01:47 +01:00
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
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
Michael Hirsch
21114a731d Merge pull request #42 from bsinno/EMPTY_CONTROLLER_ID
👍 is ok merging.
2016-02-15 12:11:41 +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
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
f18825ce34 Initial Contribution of the rollout-management feature
- Repository functionality for rollout, rolloutgroup entities
- Rollout scheduler to watch and handle running rollouts and start next
group of rollout
- Vaadin view to administrate rollouts and reflect the current rollout
status
- REST resources to cover rollout creation, updating, starting, pausing
and resuming

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-04 15:10:44 +01:00
SirWayne
bf7745160c - Fix conversion for boolean for sql query. If boolean is not wellformed
a rsql syntax error is thrown
- Escape % for sql query#
- Remove operator like ("=li=")
- Extend not equal operator with not like jpa query

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-02 09:26:22 +01:00
SirWayne
21d19b2bd2 Fix conversion for boolean (and other types) for the jpa criteria
builder

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-01 16:17:07 +01:00
Kai Zimmermann
59d1fcaf84 Applied hawkBit code format 2016-01-27 15:06:37 +01:00
Kai Zimmermann
41984f7e55 Merge remote-tracking branch 'eclipse/master' into MECS-1444-CREATE_UNIT_TEST_FOR_ENUM_FIELDS 2016-01-27 14:58:30 +01:00