lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

source code hygiene, better method naming and variable naming

Browse Source 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
This commit is contained in:
Michael Hirsch
2016-04-12 16:22:43 +02:00
parent d903be57b7
commit d704ef99fd
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/ControllerManagement.java
View File

@@ -190,7 +190,7 @@ public class ControllerManagement {
if (target == null) {
return false;
}
return actionRepository.count(ActionSpecifications.hasTargetArtifactAssigned(target, localArtifact)) > 0;
return actionRepository.count(ActionSpecifications.hasTargetAssignedArtifact(target, localArtifact)) > 0;
}
/**

8
hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/specifications/ActionSpecifications.java
View File

@@ -47,14 +47,14 @@ public class ActionSpecifications {
* assigned
* @return a specification to use with spring JPA
*/
public static Specification<Action> hasTargetArtifactAssigned(final Target target,
public static Specification<Action> hasTargetAssignedArtifact(final Target target,
final LocalArtifact localArtifact) {
return (actionRoot, query, cb) -> {
return (actionRoot, query, criteriaBuilder) -> {
final Join<Action, DistributionSet> dsJoin = actionRoot.join(Action_.distributionSet);
final SetJoin<DistributionSet, SoftwareModule> modulesJoin = dsJoin.join(DistributionSet_.modules);
final ListJoin<SoftwareModule, LocalArtifact> artifactsJoin = modulesJoin.join(SoftwareModule_.artifacts);
return cb.and(cb.equal(artifactsJoin.get(LocalArtifact_.id), localArtifact.getId()),
cb.equal(actionRoot.get(Action_.target), target));
return criteriaBuilder.and(criteriaBuilder.equal(artifactsJoin.get(LocalArtifact_.id), localArtifact.getId()),
criteriaBuilder.equal(actionRoot.get(Action_.target), target));
};
}
}