Repository API query signatures Entity free #403

kaizimmerm · 2016-12-23T07:58:02Z

Another task of #197 is to use entity IDs in queries and not the complete (JPA) object.

This makes the repository API much more JPA independent and reduces the risk even in JPA that you use and change an object in an transaction that has been changed in the meantime.

Signed-off-by: kaizimmerm <[email protected]>

Conflicts: 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/footer/ManangementConfirmationWindowLayout.java

Signed-off-by: kaizimmerm <[email protected]>

Conflicts: hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java

schabdo · 2016-12-23T10:09:02Z

...bit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetManagement.java

        final List<Target> allTargets = Collections.unmodifiableList(targetRepository
                .findAll(TargetSpecifications.byControllerIdWithStatusAndTagsInJoin(Arrays.asList(controllerID))));
-        final List<Target> unAssignTag = unAssignTag(allTargets, targetTag);
+        final List<Target> unAssignTag = unAssignTag(allTargets,
+                Optional.ofNullable(targetTagRepository.findOne(targetTagId))


Don't call the database within a nested list of method parameters

MelleD · 2016-12-30T15:57:20Z

...bit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetManagement.java

+    public void deleteTargets(final Collection<Long> targetIDs) {
+        targetRepository.deleteByIdIn(targetIDs);
+
+        targetIDs.forEach(targetId -> eventPublisher.publishEvent(new TargetDeletedEvent(tenantAware.getCurrentTenant(),


Do you know why it is necessary to fire the deletion event?
Normally the JpaTarget#fireDeleteEvent should fire the event.

No, not in is this case as this is a delete query not an entity manager delete.

MelleD · 2016-12-30T16:14:30Z

...ry/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java

     * @return a page of the found {@link Target}s
     */
    @PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET)
    Page<Target> findAllTargetsByTargetFilterQueryAndNonDS(@NotNull Pageable pageRequest, Long distributionSetId,
-            @NotNull TargetFilterQuery targetFilterQuery);
+            @NotNull String rsqlParam);


Is a empty string allowed?

Good question. We use normally NotNull for these but I guess we might switch to not empty one. However, I am not fully sure concerning the consequences.

MelleD · 2016-12-30T16:15:29Z

...ry/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java

     * @return a page of the found {@link Target}s
     */
    @PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET)
    Page<Target> findAllTargetsByTargetFilterQueryAndNotInRolloutGroups(@NotNull Pageable pageRequest,
-            List<RolloutGroup> groups, @NotNull String targetFilterQuery);
+            @NotEmpty Collection<Long> groups, @NotNull String rsqlParam);


Is a empty string allowed?

MelleD · 2016-12-30T16:21:02Z

...t-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java

     *            to delete
     */
    @PreAuthorize(SpringEvalExpressions.HAS_AUTH_DELETE_REPOSITORY)
-    void deleteDistributionSetType(@NotNull DistributionSetType type);
+    void deleteDistributionSetType(@NotNull Long typeId);


Now this method and some other throws a EntityNotFoudException. I think it is helpfull to adapt the javadoc

MelleD · 2016-12-30T16:25:46Z

...awkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetRepository.java

-    @Query(value = "SELECT DISTINCT t FROM JpaTarget t JOIN t.tags tt WHERE tt = :tag")
-    List<JpaTarget> findByTag(@Param("tag") final JpaTargetTag tag);
+    @Query(value = "SELECT DISTINCT t FROM JpaTarget t JOIN t.tags tt WHERE tt.id = :tag")
+    List<JpaTarget> findByTag(@Param("tag") final Long tag);


The tag is now a tagId. I think it's better if you rename it

MelleD · 2016-12-30T16:25:52Z

...awkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetRepository.java

@@ -196,5 +194,5 @@ void setAssignedDistributionSet(@Param("set") JpaDistributionSet set, @Param("la
     *            the page request parameter
     * @return a page of all targets related to a rollout group
     */
-    Page<Target> findByActionsRolloutGroup(JpaRolloutGroup rolloutGroup, Pageable page);
+    Page<Target> findByActionsRolloutGroupId(Long rolloutGroup, Pageable page);


Signed-off-by: kaizimmerm <[email protected]>

Conflicts: hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiDeploymentBaseTest.java

Signed-off-by: kaizimmerm <[email protected]>

* Migrated target management queries to IDs inetsead of full entities Signed-off-by: kaizimmerm <[email protected]> * Added missing comment. Signed-off-by: kaizimmerm <[email protected]> * refactored target,DS,cont,deploy,rg mangement. Signed-off-by: kaizimmerm <[email protected]> * Adde versioning documentation. Signed-off-by: kaizimmerm <[email protected]> * Rollout, Dist and Software mgmt refactored Signed-off-by: kaizimmerm <[email protected]> * Readded line that was remove by incident. Signed-off-by: kaizimmerm <[email protected]> * Fixed broken tests. Signed-off-by: kaizimmerm <[email protected]> * Query management refactored Signed-off-by: kaizimmerm <[email protected]> * Fix bug of auto assign DS delete Signed-off-by: kaizimmerm <[email protected]> * Switch to collection Signed-off-by: kaizimmerm <[email protected]> * Fixed compile error Signed-off-by: kaizimmerm <[email protected]> * Small glitches Signed-off-by: kaizimmerm <[email protected]> * Fixed test after merge Signed-off-by: kaizimmerm <[email protected]>

kaizimmerm added 10 commits December 8, 2016 16:06

Migrated target management queries to IDs inetsead of full entities

74e870a

Signed-off-by: kaizimmerm <[email protected]>

Added missing comment.

7468f72

Signed-off-by: kaizimmerm <[email protected]>

Merge branch 'master' into feature_tmgmt_enity_free

0bb9d5b

Conflicts: 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/footer/ManangementConfirmationWindowLayout.java

refactored target,DS,cont,deploy,rg mangement.

b362832

Signed-off-by: kaizimmerm <[email protected]>

Adde versioning documentation.

b7be53a

Signed-off-by: kaizimmerm <[email protected]>

Rollout, Dist and Software mgmt refactored

4cfb035

Signed-off-by: kaizimmerm <[email protected]>

Readded line that was remove by incident.

ea611ae

Signed-off-by: kaizimmerm <[email protected]>

Fixed broken tests.

65bca5c

Signed-off-by: kaizimmerm <[email protected]>

Query management refactored

de13161

Signed-off-by: kaizimmerm <[email protected]>

Fix bug of auto assign DS delete

3ff6bbd

Signed-off-by: kaizimmerm <[email protected]>

kaizimmerm requested a review from michahirsch December 23, 2016 08:01

Merge branch 'master' into feature_tmgmt_enity_free

2ee2511

Conflicts: hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java

schabdo reviewed Dec 23, 2016

View reviewed changes

MelleD reviewed Dec 30, 2016

View reviewed changes

kaizimmerm added 5 commits January 10, 2017 12:00

Switch to collection

b77cfd5

Signed-off-by: kaizimmerm <[email protected]>

Fixed compile error

1e8807d

Signed-off-by: kaizimmerm <[email protected]>

Small glitches

5cd03f2

Signed-off-by: kaizimmerm <[email protected]>

Merge branch 'master' into feature_tmgmt_enity_free

e4f89a3

Conflicts: hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiDeploymentBaseTest.java

Fixed test after merge

8282d9d

Signed-off-by: kaizimmerm <[email protected]>

kaizimmerm merged commit 889d149 into eclipse-hawkbit:master Jan 11, 2017

kaizimmerm deleted the feature_tmgmt_enity_free branch January 11, 2017 13:32

kaizimmerm modified the milestone: 0.2.0M3 Apr 3, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Repository API query signatures Entity free #403

Repository API query signatures Entity free #403

kaizimmerm commented Dec 23, 2016

schabdo Dec 23, 2016

MelleD Dec 30, 2016

kaizimmerm Jan 10, 2017

MelleD Dec 30, 2016 •

edited

Loading

kaizimmerm Jan 10, 2017

MelleD Dec 30, 2016

MelleD Dec 30, 2016

MelleD Dec 30, 2016

MelleD Dec 30, 2016

Repository API query signatures Entity free #403

Repository API query signatures Entity free #403

Conversation

kaizimmerm commented Dec 23, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MelleD Dec 30, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MelleD Dec 30, 2016 •

edited

Loading