Remove TargetInfo entity #453
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
Conflicts: hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementTest.java
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
kaizimmerm
commented
Mar 8, 2017
| .publishEvent(new TargetUpdatedEvent(this, EventPublisherHolder.getInstance().getApplicationId())); | ||
| final ObjectChangeSet objectChanges = ((UpdateObjectQuery) descriptorEvent.getQuery()).getObjectChangeSet(); | ||
|
|
||
| if (objectChanges.getChangedAttributeNames().stream() |
There was a problem hiding this comment.
Move logic into caller
kaizimmerm
commented
Mar 8, 2017
| // through JQL | ||
| final JpaTarget target = (JpaTarget) action.getTarget(); | ||
| target.setUpdateStatus(TargetUpdateStatus.PENDING); | ||
| entityManager.detach(target); | ||
|
|
||
| afterCommit.afterCommit(() -> eventPublisher | ||
| .publishEvent(new TargetUpdatedEvent(action.getTarget(), applicationContext.getId()))); |
There was a problem hiding this comment.
Use target reference for readability
michahirsch
suggested changes
Mar 10, 2017
MelleD
reviewed
Mar 10, 2017
| * the parent rollout group the actions should reference. null | ||
| * references the first group | ||
| * @return the amount of started actions | ||
| */ | ||
| @PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET) | ||
| long startScheduledActionsByRolloutGroupParent(@NotNull Rollout rollout, RolloutGroup rolloutGroupParent); | ||
| long startScheduledActionsByRolloutGroupParent(@NotNull Long rolloutId, Long rolloutGroupParentId); |
MelleD
reviewed
Mar 10, 2017
| // check if we need to override running update actions | ||
| final Set<Long> overrideObsoleteUpdateActions = overrideObsoleteUpdateActions( | ||
| Collections.singletonList(action.getTarget().getId())); | ||
|
|
||
| if (action.getTarget().getAssignedDistributionSet() != null && action.getDistributionSet().getId() | ||
| .equals(action.getTarget().getAssignedDistributionSet().getId())) { | ||
| if (((JpaTarget) action.getTarget()).getAssignedDistributionSet() != null && action.getDistributionSet().getId() |
There was a problem hiding this comment.
For better reagability use a variable for the cast (JpaTarget) action.getTarget(). Then you have only 1 instead of 2 cast
Conflicts: hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DataConversionHelper.java hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBeanQuery.java
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
michahirsch
approved these changes
Mar 17, 2017
AmmarBikic
pushed a commit
to bosch-io/hawkbit
that referenced
this pull request
Oct 2, 2020
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
TargetInfo was historically there to allow a fork on the spring audit listener. The idea was that devices should not trigger an audit log write (only users). So TargetInfo contained all properties that are set by a device (controller). However, our security is much more evolved these days. So we can merge Target and TargetInfo back together and instead create a condition that ensures that audit data is not changed if data is written by a controller.