Refactor @ApiResponses annotations (#2879)

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>

hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/RolloutHelper.java

@@ -167,8 +167,8 @@ public final class RolloutHelper {
      * @param group the target group
      * @return RSQL string without base filter of the Rollout. Can be an empty string.
      */
-    public static String getOverlappingWithGroupsTargetFilter(final String baseFilter, final List<RolloutGroup> groups,
-            final RolloutGroup group) {
+    public static String getOverlappingWithGroupsTargetFilter(
+            final String baseFilter, final List<RolloutGroup> groups, final RolloutGroup group) {
         final String groupFilter = group.getTargetFilterQuery();
         // when any previous group has the same filter as the target group the
         // overlap is 100%
@@ -248,8 +248,7 @@ public final class RolloutHelper {
 
     private static boolean isTargetFilterInGroups(final String groupFilter, final List<RolloutGroup> groups) {
         return !ObjectUtils.isEmpty(groupFilter)
-                && groups.stream().anyMatch(prevGroup -> !ObjectUtils.isEmpty(prevGroup.getTargetFilterQuery())
-                && prevGroup.getTargetFilterQuery().equals(groupFilter));
+                && groups.stream().anyMatch(group -> groupFilter.equals(group.getTargetFilterQuery()));
     }
 
     private static String concatAndTargetFilters(final String... filters) {

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaRolloutManagement.java

@@ -376,8 +376,9 @@ public class JpaRolloutManagement implements RolloutManagement {
     /**
      * Check if on resume of a paused rollout the next group shall be started directly.
      * Cases where we need to manually start the next group:
-     *  - last running group is in error state and there is still some old group in running state, only running groups would be evaluated which would leave Rollout in running state but no trigger new group
-     *  - last running group has success action to PAUSE and the success condition is fulfilled
+     * - last running group is in error state and there is still some old group in running state, only running groups would be evaluated which would leave Rollout in running state but no trigger new group
+     * - last running group has success action to PAUSE and the success condition is fulfilled
+     *
      * @param rollout
      * @param lastStartedGroup
      * @return true if next group shall be started directly on resume, false otherwise
@@ -964,8 +965,7 @@ public class JpaRolloutManagement implements RolloutManagement {
             RolloutHelper.verifyRolloutGroupTargetPercentage(group.getTargetPercentage());
 
             final long targetsInGroupFilter = targetFilterCounts.get(groupTargetFilter);
-            final long overlappingTargets = countOverlappingTargetsWithPreviousGroups(baseFilter, groups, group, i,
-                    targetFilterCounts);
+            final long overlappingTargets = countOverlappingTargetsWithPreviousGroups(baseFilter, groups, group, i, targetFilterCounts);
 
             final long realTargetsInGroup;
             // Assume that targets which were not used in the previous groups
@@ -995,8 +995,7 @@ public class JpaRolloutManagement implements RolloutManagement {
             return 0;
         }
         final List<RolloutGroup> previousGroups = groups.subList(0, groupIndex);
-        final String overlappingTargetsFilter = RolloutHelper.getOverlappingWithGroupsTargetFilter(baseFilter,
-                previousGroups, group);
+        final String overlappingTargetsFilter = RolloutHelper.getOverlappingWithGroupsTargetFilter(baseFilter, previousGroups, group);
 
         if (targetFilterCounts.containsKey(overlappingTargetsFilter)) {
             return targetFilterCounts.get(overlappingTargetsFilter);
@@ -1007,8 +1006,8 @@ public class JpaRolloutManagement implements RolloutManagement {
         }
     }
 
-    private long calculateRemainingTargets(final List<RolloutGroup> groups, final String targetFilter, final Long createdAt,
-            final Long dsTypeId) {
+    private long calculateRemainingTargets(
+            final List<RolloutGroup> groups, final String targetFilter, final Long createdAt, final Long dsTypeId) {
         final TargetCount targets = calculateTargets(targetFilter, createdAt, dsTypeId);
 
         final long totalTargets = targets.total();

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAction.java

@@ -23,7 +23,6 @@ import java.util.Optional;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
-import jakarta.persistence.ConstraintMode;
 import jakarta.persistence.Convert;
 import jakarta.persistence.Converter;
 import jakarta.persistence.Entity;

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRolloutGroup.java

@@ -53,8 +53,7 @@ public class JpaRolloutGroup extends AbstractJpaNamedEntity implements RolloutGr
 
     @Getter
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(
-            name = "rollout", nullable = false, updatable = false)
+    @JoinColumn(name = "rollout", nullable = false, updatable = false)
     private JpaRollout rollout;
 
     @Setter
@@ -63,9 +62,8 @@ public class JpaRolloutGroup extends AbstractJpaNamedEntity implements RolloutGr
     @Convert(converter = RolloutGroupStatusConverter.class)
     private RolloutGroupStatus status = RolloutGroupStatus.CREATING;
 
-    @OneToMany(
-            mappedBy = "rolloutGroup", fetch = FetchType.LAZY,
-            cascade = { CascadeType.PERSIST, CascadeType.REMOVE }, targetEntity = RolloutTargetGroup.class)
+    @OneToMany(targetEntity = RolloutTargetGroup.class, mappedBy = "rolloutGroup",
+            fetch = FetchType.LAZY, cascade = { CascadeType.PERSIST, CascadeType.REMOVE })
     private List<RolloutTargetGroup> rolloutTargetGroup;
 
     // No foreign key to avoid to many nested cascades on delete which some DBs cannot handle

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/scheduler/JpaRolloutExecutor.java

@@ -18,7 +18,6 @@ import static org.eclipse.hawkbit.repository.jpa.executor.AfterTransactionCommit
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Proxy;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/scheduler/AutoAssignHandlerTest.java

@@ -23,7 +23,6 @@ import java.util.UUID;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.locks.Lock;
 
-import org.assertj.core.api.Assertions;
 import org.eclipse.hawkbit.repository.DeploymentManagement;
 import org.eclipse.hawkbit.repository.TargetFilterQueryManagement;
 import org.eclipse.hawkbit.repository.TargetManagement;