Commit Graph

184 Commits

Author SHA1 Message Date
Kai Zimmermann
d59ebaebd8 Merge pull request #181 from bsinno/Feature/Add_Rest_Api_with_Java_client
Feature/add rest api with java client
2016-05-24 16:11:25 +02:00
SirWayne
354ed91fa7 Merge branch 'master' into Feature/Add_Rest_Api_with_Java_client
Conflicts:
	examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/Start.java
	examples/hawkbit-mgmt-api-client/pom.xml
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/DistributionSetBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/DistributionSetTypeBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/RolloutBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/SoftwareModuleBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/SoftwareModuleTypeBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/TagBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/TargetBuilder.java
	hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/ArtifactStoreController.java
	hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/DataConversionHelper.java
	hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/RootController.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitEventProvider.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/UiProperties.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/BaseSwModuleBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadHandler.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractTableDetailsLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTable.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/ProxyTarget.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/ManageDistBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterTable.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterQueryValidation.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/event/CustomFilterUIEvent.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/login/LoginView.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/CreateUpdateDistributionTagLayoutWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/tag/CreateUpdateTagLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.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
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CreateUpdateTargetTagLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/DistributionBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/ProxyRollout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/ProxyRolloutGroup.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListHeader.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPDateTimeUtil.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/others.scss
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/rollout.scss
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/target-filter-query.scss
	hawkbit-ui/src/main/resources/messages.properties
	hawkbit-ui/src/main/resources/messages_de.properties
	hawkbit-ui/src/main/resources/messages_en.properties


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 11:16:18 +02:00
Michael Hirsch
dcbf27e3ed add junit tests to security of getTargetSecurityToken
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-17 08:04:33 +02:00
Michael Hirsch
7a281a8236 allow the getTargetSecurityToken can be called as system code
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-13 15:38:52 +02:00
Michael Hirsch
1420b9c292 Merge pull request #161 from bsinno/feature_add_targettoken_to_dmf
Add target security token to DMF update message
2016-05-09 13:07:51 +02:00
Kai Zimmermann
7d8095ede7 Merge branch 'master' into fix-set-db-read-uncommited
Conflicts:
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TenantConfigurationManagement.java


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-06 10:17:18 +02:00
Michael Hirsch
5220fa07ce allow system code to read tenant configuration
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-06 08:40:08 +02:00
Michael Hirsch
077e3c8d38 add unit test for verification
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-06 08:16:12 +02:00
Michael Hirsch
d442a45b7a run getting polling configuration in system-code
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-06 08:02:11 +02:00
Michael Hirsch
e2d9033821 remove singleton instance wihthin TenantConfigurationManagement
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-04 19:37:58 +02:00
Kai Zimmermann
882c689a51 Migrated sonar false positives from qube into code.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-04 12:13:26 +02:00
Kai Zimmermann
16350c5e15 Made URL generator configurable.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-03 18:34:16 +02:00
Kai Zimmermann
f32f612e83 Improved readability of action status messages that are created by the
update server itself.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-03 15:56:16 +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
Kai Zimmermann
f3236a57db Fixed sonar issue for Long equal check.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-03 08:28:19 +02:00
Kai Zimmermann
426d95394b Fixed broken merge.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-02 18:13:26 +02:00
Kai Zimmermann
507c355d35 Merge remote-tracking branch 'eclipse/master' into
fix-set-db-read-uncommited

Fixed small typo


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-02 18:10:21 +02:00
Kai Zimmermann
c1b9fb48e8 No need to get EM if no tenant has to be set.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-04-29 08:44:29 +02:00
Michael Hirsch
607c98b819 remove current tenant null check cause not all queries have current
tenant and must set it for tenant indenpendent queries like
SystemManagement

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-29 07:21:43 +02:00
Michael Hirsch
97eb406fa6 Merge pull request #145 from bsinno/performance_rollout_target_group_creation
make use of the existencechecking annotation for targetrolloutgroup
2016-04-28 14:45:36 +02:00
Michael Hirsch
4e48c7c9d7 code cleanup pull-request feedback
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-28 11:46:01 +02:00
Michael Hirsch
30788904be code cleanup pull-request feedback
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-28 11:45:06 +02:00
Michael Hirsch
f62b740ae8 change propagation level to SUPPORTS instead of NOT_SUPPORTED
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-28 11:43:46 +02:00
Michael Hirsch
9db2a1bf1b Merge branch 'master' into fix_rolloutmanagement_transaction_handling_deadlock 2016-04-28 11:27:49 +02:00
Michael Hirsch
5703abf680 Merge pull request #132 from bsinno/eclipselink-tenancy
Eclipselink tenancy
2016-04-27 12:27:49 +02:00
SirWayne
c2649b4b54 Add example feign core project
add system client api


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-26 16:19:37 +02:00
Kai Zimmermann
328d5ab2b0 Set complex assignment operations to READ_COMMITED to ensure consitent
updates.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-04-26 11:07:15 +02:00
Kai Zimmermann
20bdafc750 Merge branch 'master' into fix-set-db-read-uncommited 2016-04-26 11:00:30 +02:00
Kai Zimmermann
66914de984 Set default behavior of our repository transaction isolation level to
READ_UNCOMMITED.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-04-26 10:58:24 +02:00
Kai Zimmermann
6e85c724bf Removed the method exception from transaction manager as they where not
needed anymore. The bean in systemmanagement should also not open a
transaction.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-04-25 14:09:38 +02:00
SirWayne
5cfb933ca1 Add Rest configuration for test
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-25 10:45:48 +02:00
SirWayne
3fa9105428 Add test dependencies
Add name of @PathVariable

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-21 10:02:03 +02:00
Michael Hirsch
8eac737219 update javadoc and remove author from it
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-18 07:47:23 +02:00
Michael Hirsch
fd7fb7bd01 make use of the existencechecking annotation for targetrolloutgroup
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-18 07:41:33 +02:00
Michael Hirsch
5fd220a5e3 change transaction handling of creating groups and check running
Rollouts

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-16 10:42:26 +02:00
Michael Hirsch
2ca807916c fix lookup by filename and not by ID because the ID is unique and the
filename exists multiple times

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-14 13:32:24 +02:00
Michael Hirsch
d704ef99fd source code hygiene, better method naming and variable naming
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-12 16:22:43 +02:00
Michael Hirsch
c4fd082098 fix the lookup of artifacts with the same lookup key, e.g. SHA1 hash if
multiple artifacts with key exists for different software modules

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-12 09:39:07 +02:00
Kai Zimmermann
0c800d3149 Fixed condition 2016-04-08 06:13:16 +02:00
Kai Zimmermann
a7d0306e75 Removed unnecessary transaction exceptions.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-04-08 05:37:21 +02:00
Michael Hirsch
cadf67ad6c Merge pull request #122 from bsinno/reduce-duplicate-metadata
Reduce duplicate metadata code
2016-04-07 08:34:49 +02:00
Kai Zimmermann
f4f9c10186 Optimized equals.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-04-06 10:57:23 +02:00
Michael Hirsch
8bb3469b52 Merge branch 'master' into Download_server_supports_download_through_HTTP_and_HTTPs 2016-04-05 15:45:47 +02:00
Kai Zimmermann
bf168ffb70 reduced duplicate code. 2016-04-05 14:00:57 +02:00
Michael Hirsch
df1d4c5a20 Merge branch 'master' into
Download_server_supports_download_through_HTTP_and_HTTPs

Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationKey.java


Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-05 11:58:27 +02:00
SirWayne
044f0bef03 Reduce some duplicate code
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-04 12:59:45 +02:00
Kai Zimmermann
0a0c08b700 Fixed wrong call of sw module type. UI uses name and not key.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-04-01 15:55:00 +02:00
Kai Zimmermann
802288c5a1 Merge pull request #113 from bsinno/consolidate-equals-hashcode
Consolidate equals hashcode
2016-03-31 17:30:28 +02:00
Kai Zimmermann
ae7585e1bc Added description to test asserts.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-03-31 14:47:00 +02:00
Kai Zimmermann
3d9b1465a2 Added missing license header.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-03-31 11:31:01 +02:00