diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaControllerManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaControllerManagement.java index c12838c9b..03ace2e1f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaControllerManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaControllerManagement.java @@ -165,6 +165,8 @@ public class JpaControllerManagement implements ControllerManagement { @Override public Optional findOldestActiveActionByTarget(final Target target) { + // used in favorite to findFirstByTargetAndActiveOrderByIdAsc due to + // DATAJPA-841 issue. return actionRepository.findFirstByTargetAndActive(new Sort(Direction.ASC, "id"), (JpaTarget) target, true); } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutGroupManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutGroupManagement.java index 64d81cb70..eba63b6c6 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutGroupManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutGroupManagement.java @@ -114,7 +114,7 @@ public class JpaRolloutGroupManagement implements RolloutGroupManagement { for (final RolloutGroup rolloutGroup : rolloutGroups) { final TotalTargetCountStatus totalTargetCountStatus = new TotalTargetCountStatus( - allStatesForRollout.get(rolloutGroup.getId()), new Long(rolloutGroup.getTotalTargets())); + allStatesForRollout.get(rolloutGroup.getId()), Long.valueOf(rolloutGroup.getTotalTargets())); rolloutGroup.setTotalTargetCountStatus(totalTargetCountStatus); } @@ -128,7 +128,7 @@ public class JpaRolloutGroupManagement implements RolloutGroupManagement { .getStatusCountByRolloutGroupId(rolloutGroupId); final TotalTargetCountStatus totalTargetCountStatus = new TotalTargetCountStatus(rolloutStatusCountItems, - new Long(rolloutGroup.getTotalTargets())); + Long.valueOf(rolloutGroup.getTotalTargets())); rolloutGroup.setTotalTargetCountStatus(totalTargetCountStatus); return rolloutGroup; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSoftwareManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSoftwareManagement.java index 62ebfcb69..401c20895 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSoftwareManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSoftwareManagement.java @@ -204,7 +204,7 @@ public class JpaSoftwareManagement implements SoftwareManagement { @Override public Long countSoftwareModulesByType(final SoftwareModuleType type) { - final List> specList = new LinkedList<>(); + final List> specList = new ArrayList<>(2); Specification spec = SoftwareModuleSpecification.equalType((JpaSoftwareModuleType) type); specList.add(spec); diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaActionStatus.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaActionStatus.java index 061351053..8fa774c00 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaActionStatus.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaActionStatus.java @@ -49,6 +49,8 @@ import com.google.common.base.Splitter; // sub entities @SuppressWarnings("squid:S2160") public class JpaActionStatus extends AbstractJpaTenantAwareBaseEntity implements ActionStatus { + private static final int MESSAGE_ENTRY_LENGTH = 512; + private static final long serialVersionUID = 1L; @Column(name = "target_occurred_at") @@ -138,9 +140,9 @@ public class JpaActionStatus extends AbstractJpaTenantAwareBaseEntity implements public final void addMessage(final String message) { if (message != null) { if (messages == null) { - messages = new ArrayList<>((message.length() / 512) + 1); + messages = new ArrayList<>((message.length() / MESSAGE_ENTRY_LENGTH) + 1); } - Splitter.fixedLength(512).split(message).forEach(messages::add); + Splitter.fixedLength(MESSAGE_ENTRY_LENGTH).split(message).forEach(messages::add); } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/DelayedEventBusPushStrategy.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/DelayedEventBusPushStrategy.java index 0fdb06a46..5f72478cb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/DelayedEventBusPushStrategy.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/DelayedEventBusPushStrategy.java @@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import org.eclipse.hawkbit.eventbus.event.EntityEvent; +import org.eclipse.hawkbit.eventbus.event.Event; import org.eclipse.hawkbit.im.authentication.TenantAwareAuthenticationDetails; import org.eclipse.hawkbit.ui.UIEventProvider; import org.slf4j.Logger; @@ -98,7 +99,7 @@ public class DelayedEventBusPushStrategy implements EventPushStrategy { */ @Subscribe @AllowConcurrentEvents - public void dispatch(final org.eclipse.hawkbit.eventbus.event.Event event) { + public void dispatch(final Event event) { // to dispatch too many events which are not interested on the UI if (!isEventProvided(event)) { LOG.trace("Event is not supported in the UI!!! Dropped event is {}", event); @@ -111,7 +112,7 @@ public class DelayedEventBusPushStrategy implements EventPushStrategy { } } - private boolean isEventProvided(final org.eclipse.hawkbit.eventbus.event.Event event) { + private boolean isEventProvided(final Event event) { return eventProvider.getSingleEvents().contains(event.getClass()) || eventProvider.getBulkEvents().contains(event.getClass()); } @@ -148,8 +149,7 @@ public class DelayedEventBusPushStrategy implements EventPushStrategy { * @return {@code true} if the event can be dispatched to the UI otherwise * {@code false} */ - protected static boolean eventSecurityCheck(final SecurityContext userContext, - final org.eclipse.hawkbit.eventbus.event.Event event) { + protected static boolean eventSecurityCheck(final SecurityContext userContext, final Event event) { if (userContext == null || userContext.getAuthentication() == null) { return false; } @@ -182,13 +182,13 @@ public class DelayedEventBusPushStrategy implements EventPushStrategy { return; } - final List events = new ArrayList<>(size); + final List events = new ArrayList<>(size); for (int i = 0; i < size; i++) { - final org.eclipse.hawkbit.eventbus.event.Event pollEvent = queue.poll(); + final Event pollEvent = queue.poll(); if (pollEvent == null) { continue; } - events.add(i, pollEvent); + events.add(pollEvent); } if (events.isEmpty()) { @@ -213,8 +213,7 @@ public class DelayedEventBusPushStrategy implements EventPushStrategy { } - private void doDispatch(final List events, - final WrappedSession wrappedSession) { + private void doDispatch(final List events, final WrappedSession wrappedSession) { final SecurityContext userContext = (SecurityContext) wrappedSession .getAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY); final SecurityContext oldContext = SecurityContextHolder.getContext(); @@ -225,10 +224,10 @@ public class DelayedEventBusPushStrategy implements EventPushStrategy { if (vaadinSession.getState() != State.OPEN) { return; } - LOG.debug("UI EventBus aggregator of UI {} got lock on session.", uiid); + LOG.debug("UI EventBus aggregator of UI {} got lock on session.", vaadinUI.getUIId()); fowardSingleEvents(events, userContext); fowardBulkEvents(events, userContext); - LOG.debug("UI EventBus aggregator of UI {} left lock on session.", uiid); + LOG.debug("UI EventBus aggregator of UI {} left lock on session.", vaadinUI.getUIId()); }).get(); } catch (InterruptedException | ExecutionException e) { LOG.error("Wait for Vaadin session for UI {} interrupted!", uiid, e); @@ -237,8 +236,7 @@ public class DelayedEventBusPushStrategy implements EventPushStrategy { } } - private void fowardBulkEvents(final List events, - final SecurityContext userContext) { + private void fowardBulkEvents(final List events, final SecurityContext userContext) { final Set> filterBulkEvenTypes = eventProvider.getFilteredBulkEventsType(events); for (final Class bulkType : filterBulkEvenTypes) { @@ -252,8 +250,7 @@ public class DelayedEventBusPushStrategy implements EventPushStrategy { } } - private void fowardSingleEvents(final List events, - final SecurityContext userContext) { + private void fowardSingleEvents(final List events, final SecurityContext userContext) { events.stream() .filter(event -> DelayedEventBusPushStrategy.eventSecurityCheck(userContext, event) && eventProvider.getSingleEvents().contains(event.getClass()))