Commit Graph

37 Commits

Author SHA1 Message Date
Kai Zimmermann
85263e475d use correct term for token. Similar to mgmt API.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-03 09:48:55 +02:00
Kai Zimmermann
dbc70ae374 Added targetToken to DMF update message.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-03 09:25:07 +02:00
Michael Hirsch
d903be57b7 use correct mock parameters to ensure test
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-12 15:50:48 +02:00
Michael Hirsch
0b5286299c fix unit tests after changing the lookup way
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-12 10:03:19 +02:00
Jonathan Philip Knoblauch
b03fa5eec8 Verify all download URLs generated by SP-server (e.g. DDI and DMF API)
- the get artifact request for the DDI API know contains https links
- additional there where http links added
- section for creating download urls based on patters was moved to hawkbit-core
- tests where adapted and extended

Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-03-31 13:17:08 +02:00
Michael Hirsch
1cb7519ace add security and filters for anonymous download via http and amqp
requests

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-03-23 16:17:53 +01:00
Michael Hirsch
cdac7185c4 fix typo of class TenantSecurityToken and handle authentication message
based on FileResource not only on SHA1 hash

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-03-23 10:23:35 +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
SirWayne
6c74c1186d Create unit test for the json amqp message conversion
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-03-08 12:23:31 +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
Michael Hirsch
74731d39ce fix retrieving the wrong message converter for converting messages over
amqp

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-03-03 10:57:57 +01:00
SirWayne
052d50e98d Merge branch 'Clean_Code' into Multiple_VHost_Connection
Conflicts:
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-03-02 14:14:09 +01:00
SirWayne
5973413cbe Add Javadoc and remove message converter from base class
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-03-01 08:37: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
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
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
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
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
ecdf38b4f9 Fixed typo 2016-02-23 22:12:29 +01:00
Kai Zimmermann
7f2a9d1ed2 Features harmonised, more test descriptions 2016-02-23 09:57:18 +01:00
SirWayne
b4421e7e44 Add JavaDoc, refactor staff for clean code convention and modify unit
tests

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-16 12:24:33 +01:00
SirWayne
c737614e9b Add sender service to customize sending messages
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-15 08:55:44 +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
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
Kai Zimmermann
2f0bf6629f Reapplied hawkBit code formatter.
It seems that from Luna to Mars Eclipse changed how the code formatter
handles lines breaks in certain cases. This is now the “Mars” variant.
2016-01-27 10:12:11 +01:00
Kai Zimmermann
64deaeea3c Remove swagger and minor feature extensions and bug fixes
- Various Bug fixes and improvements
- Management API extended
- Swagger removed
- Guava Upgraded to 19
2016-01-21 13:42:38 +01:00
Kai Zimmermann
7497ab61ed Initial check in accordance with Parallel IP 2016-01-21 13:18:55 +01:00