Commit Graph

103 Commits

Author SHA1 Message Date
Kai Zimmermann
3f49567cdc Optimize rollout group start (#318)
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-10-20 16:27:33 +02:00
Marcel Mager (INST-IOT/ESB)
3b47d43dec Merge branch 'master' into feature_target_filtering_supports_overdue
Conflicts:
	hawkbit-repository\hawkbit-repository-jpa\src\main\java\org\eclipse\hawkbit\repository\jpa\JpaDeploymentManagement.java
	hawkbit-repository\hawkbit-repository-jpa\src\main\java\org\eclipse\hawkbit\repository\jpa\JpaTargetManagement.java
	hawkbit-ui\src\main\java\org\eclipse\hawkbit\ui\management\targettable\TargetBeanQuery.java
	hawkbit-ui\src\main\java\org\eclipse\hawkbit\ui\management\targettable\TargetTable.java


Signed-off-by: Marcel Mager (INST-IOT/ESB) <Marcel.Mager@bosch-si.com>
2016-10-18 12:57:10 +02:00
Kai Zimmermann
c7129e6ed7 Optimisation and bug fixing of UI push events (#310)
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-10-17 21:59:53 +02:00
Dominik Herbst
86cba3c8bf Merge branch 'master' into feature_target_filtering_supports_overdue
Conflicts:
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/RepositoryApplicationConfiguration.java
	hawkbit-ui/src/main/resources/messages_de.properties
	hawkbit-ui/src/main/resources/messages_en.properties
2016-10-13 10:59:12 +02:00
Dominik Herbst
f768c16e94 Set initial capacity for new ArrayList or replaced the usage of ArrayList.
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-10-12 14:41:41 +02:00
Dominik Herbst
0e6f2e01cf Merge branch 'master' into feature_auto_assignment_squashed 2016-10-07 14:57:11 +02:00
Dominik Herbst
4785f36b34 Merge branch 'master' into feature_target_filtering_supports_overdue
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterQueryValidation.java
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/target-filter-query.scss
2016-10-05 09:22:04 +02:00
Dominik Herbst
339f45ca6a Fixed sanitizing of filter query sort parameters. Corrected name of TargetManagement method
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-10-04 11:57:56 +02:00
Dominik Herbst
f481e097db Using AutoAssignProperties with EnableConfigurationProperties. Code quality improvements.
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-10-04 08:19:44 +02:00
Michael Hirsch
eccce5cc5b merge master
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-09-30 09:28:20 +02:00
Dominik Herbst
b1d9930d94 Optimized implementation of VirtualPropertyReplacer.
Added auto configuration for VirtualPropertyResolver.

Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-09-28 13:54:54 +02:00
Kai Zimmermann
5c53bef164 Configurable download URL generation (#296)
Configurable download URL generation.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-09-28 09:18:03 +02:00
Dominik Herbst
9265f17e19 Merge branch 'master' into feature_target_filtering_supports_overdue
Conflicts:
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetManagement.java
2016-09-27 13:40:02 +02:00
Dominik Herbst
405a0aa125 Fixed visibility and sonar issues
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-09-27 11:10:52 +02:00
kaizimmerm
06800f185e JavaDoc and performance
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-09-27 10:40:38 +02:00
Dominik Herbst
03e2ee81b8 Added auto assign distribution set to target filter query feature
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-09-23 10:41:33 +02:00
Marcel Mager (INST-IOT/ESB)
52576a4489 Add comment for public constructor.
Signed-off-by: Marcel Mager (INST-IOT/ESB) <Marcel.Mager@bosch-si.com>
2016-09-23 08:36:10 +02:00
Marcel Mager (INST-IOT/ESB)
e8d301a0a9 Fix license header.
Signed-off-by: Marcel Mager (INST-IOT/ESB) <Marcel.Mager@bosch-si.com>
2016-09-22 17:12:16 +02:00
kaizimmerm
948196ae28 Added immutable comments.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-09-22 11:48:41 +02:00
Marcel Mager (INST-IOT/ESB)
07a158534f Fix issues from static code analysis
Signed-off-by: Marcel Mager (INST-IOT/ESB) <Marcel.Mager@bosch-si.com>
2016-09-22 10:28:08 +02:00
Jonathan Philip Knoblauch
ae583e4938 Refactoring and adapted CSS styling to HawkBit
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-09-21 17:47:19 +02:00
Marcel Mager (INST-IOT/ESB)
2433742abf Overdue filter: Add simple filter for overdue in UI
Signed-off-by: Marcel Mager (INST-IOT/ESB) <Marcel.Mager@bosch-si.com>
2016-09-21 17:03:25 +02:00
Michael Hirsch
92b16470b3 Merge branch 'master' into feature_rsql_parser_suggestion
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java


Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-09-21 09:14:04 +02:00
kaizimmerm
66297d7c27 reduced empty collections. Fixed Ui eventbus memory leak.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-09-20 13:40:51 +02:00
kaizimmerm
01533d1538 Merge branch 'master' into fix_wrong_error_response 2016-09-14 09:26:24 +02:00
Kai Zimmermann
da1f91b24a Merge pull request #283 from bsinno/fix_dmf_cancel
Fixed DMF sending out wrong message if action on CANCELING
2016-09-13 09:44:37 +02:00
Michael Hirsch
0986b9985b don't requeue too many status entries ex, fix typo of ex
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-09-12 09:27:43 +02:00
kaizimmerm
47e3417f55 Improved method naming
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-09-07 12:17:50 +02:00
Michael Hirsch
bdd56c3b4a validate the type parameter of softwaremodule
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-09-06 11:26:56 +02:00
kaizimmerm
b317823e86 Fixed entity content validation.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-09-05 14:56:28 +02:00
Michael Hirsch
79b1ae8728 introduce autocomplete textfield with RSQL suggestion
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-09-05 13:36:52 +02:00
Kai Zimmermann
8ce8d8e571 Fixed DMF sending out wrong message if action on CANCELING
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-09-05 09:17:15 +02:00
Kai Zimmermann
000fa2ab9b Merge pull request #279 from bsinno/fix_negative_max_assignments
Fix negative max assignments of softwareModuleTypes
2016-08-31 08:55:44 +02:00
Melanie Retter
f3534bc4d9 Refactor, add db clean script
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-26 10:32:48 +02:00
Melanie Retter
34daea319c Rename constant WHITESPACE
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-25 10:39:50 +02:00
Melanie Retter
d84365e3d2 Refactor
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-25 09:51:16 +02:00
Melanie Retter
d323f67648 Refactor ConstraintViolationException
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-24 16:38:18 +02:00
Melanie Retter
50a86cdb7b ConstraintViolationException can contain mulitple violation messages
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-24 13:48:18 +02:00
Melanie Retter
679f465db1 Insert custom constraintViolationException
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-24 13:07:37 +02:00
Melanie Retter
9f5a2ea3d5 Delete ConstraintViolationException, correct db migration script
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-23 17:11:33 +02:00
Melanie Retter
2ae08ffaef Add constraint to the database column maxAssignment
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-23 16:10:27 +02:00
SirWayne
84c9296a70 Merge branch 'eclipse/master' into
fix_unhandled_ConstraintViolationException

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-19 14:38:28 +02:00
SirWayne
a4703ea0a8 Merge remote-tracking branch 'eclipse/master' into
fix-improve-code-quality

Conflicts:
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityPropertyChangeListener.java
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadatadetailslayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-16 15:17:30 +02:00
SirWayne
aa5e4d0601 - Fix ds assignment result
- Fix drag and drop to assignment

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-15 17:57:52 +02:00
Dominic Schabel
3accac9ade Minor code improvements
Signed-off-by: Dominic Schabel dominic.schabel@bosch-si.com
2016-08-15 13:17:37 +02:00
Gaurav
d7539de64d Merge branch 'master' into feature_enable_push_in_deployment_view
Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/eventbus/event/TargetDeletedEvent.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleMetadatadetailslayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java


Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-10 11:44:23 +02:00
Dominic Schabel
9c7db25197 Merge branch 'master' into Feature_Improve_Code_Quality
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>

# Conflicts:
#	hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/WithSpringAuthorityRule.java
2016-08-08 16:40:00 +02:00
Gaurav
8fa2a60a71 Formatted the code.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-08 13:30:16 +02:00
Gaurav
e42f8164a8 Incorporated the review comments.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-08 13:24:12 +02:00
Michael Hirsch
431143133b fix license header
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-05 13:19:29 +02:00