From e6146fa55e86ea67614fa2c2494464bec2e4f9f1 Mon Sep 17 00:00:00 2001
From: Dominic Schabel <dominic.schabel@bosch-si.com>
Date: Fri, 24 May 2019 11:40:41 +0200
Subject: [PATCH] Sonar issue fixed

Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
---
 .../hawkbit/repository/jpa/JpaRolloutManagement.java   | 10 +++++-----
 .../rollout/rollout/AddUpdateRolloutWindowLayout.java  |  7 +++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutManagement.java
index 587e41562..b55ffb09b 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutManagement.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutManagement.java
@@ -631,7 +631,7 @@ public class JpaRolloutManagement extends AbstractRolloutManagement {
             ConcurrencyFailureException.class }, maxAttempts = Constants.TX_RT_MAX, backoff = @Backoff(delay = Constants.TX_RT_DELAY))
     public void pauseRollout(final long rolloutId) {
         final JpaRollout rollout = getRolloutAndThrowExceptionIfNotFound(rolloutId);
-        if (!RolloutStatus.RUNNING.equals(rollout.getStatus())) {
+        if (RolloutStatus.RUNNING != rollout.getStatus()) {
             throw new RolloutIllegalStateException("Rollout can only be paused in state running but current state is "
                     + rollout.getStatus().name().toLowerCase());
         }
@@ -650,7 +650,7 @@ public class JpaRolloutManagement extends AbstractRolloutManagement {
             ConcurrencyFailureException.class }, maxAttempts = Constants.TX_RT_MAX, backoff = @Backoff(delay = Constants.TX_RT_DELAY))
     public void resumeRollout(final long rolloutId) {
         final JpaRollout rollout = getRolloutAndThrowExceptionIfNotFound(rolloutId);
-        if (!(RolloutStatus.PAUSED.equals(rollout.getStatus()))) {
+        if (RolloutStatus.PAUSED != rollout.getStatus()) {
             throw new RolloutIllegalStateException("Rollout can only be resumed in state paused but current state is "
                     + rollout.getStatus().name().toLowerCase());
         }
@@ -751,7 +751,7 @@ public class JpaRolloutManagement extends AbstractRolloutManagement {
     }
 
     private boolean isRolloutGroupComplete(final JpaRollout rollout, final JpaRolloutGroup rolloutGroup) {
-        final Long actionsLeftForRollout = ActionType.DOWNLOAD_ONLY.equals(rollout.getActionType())
+        final Long actionsLeftForRollout = ActionType.DOWNLOAD_ONLY == rollout.getActionType()
                 ? actionRepository.countByRolloutAndRolloutGroupAndStatusNotIn(rollout, rolloutGroup,
                         DOWNLOAD_ONLY_ACTION_TERMINATION_STATUSES)
                 : actionRepository.countByRolloutAndRolloutGroupAndStatusNotIn(rollout, rolloutGroup,
@@ -887,7 +887,7 @@ public class JpaRolloutManagement extends AbstractRolloutManagement {
             throw new EntityNotFoundException(Rollout.class, rolloutId);
         }
 
-        if (RolloutStatus.DELETING.equals(jpaRollout.getStatus())) {
+        if (RolloutStatus.DELETING == jpaRollout.getStatus()) {
             return;
         }
 
@@ -1028,7 +1028,7 @@ public class JpaRolloutManagement extends AbstractRolloutManagement {
     }
 
     private static void checkIfDeleted(final Long rolloutId, final RolloutStatus status) {
-        if (RolloutStatus.DELETING.equals(status) || RolloutStatus.DELETED.equals(status)) {
+        if (RolloutStatus.DELETING == status || RolloutStatus.DELETED == status) {
             throw new EntityReadOnlyException("Rollout " + rolloutId + " is soft deleted and cannot be changed");
         }
     }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
index 69b1fd1de..0091113bb 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
@@ -348,10 +348,9 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
         }
 
         private long getForcedTimeStamp() {
-            return ActionTypeOption.AUTO_FORCED
-                    .equals(actionTypeOptionGroupLayout.getActionTypeOptionGroup().getValue())
-                            ? actionTypeOptionGroupLayout.getForcedTimeDateField().getValue().getTime()
-                            : RepositoryModelConstants.NO_FORCE_TIME;
+            return ActionTypeOption.AUTO_FORCED == actionTypeOptionGroupLayout.getActionTypeOptionGroup().getValue()
+                    ? actionTypeOptionGroupLayout.getForcedTimeDateField().getValue().getTime()
+                    : RepositoryModelConstants.NO_FORCE_TIME;
         }
 
         private Long getScheduledStartTime() {