Merge pull request #51 from bsinno/REFACTORING_CLEAN_CODE

ok this refactorings are aligned with the hawkbit sonar ruleset, merging.

hawkbit-cache-redis/src/main/java/org/eclipse/hawkbit/cache/RedisConfiguration.java

@@ -75,7 +75,7 @@ public class RedisConfiguration {
      */
     @Bean
     public RedisTemplate<String, Object> redisTemplate() {
-        final RedisTemplate<String, Object> redisTemplate = new RedisTemplate<String, Object>();
+        final RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
         redisTemplate.setConnectionFactory(jedisConnectionFactory());
         redisTemplate.setKeySerializer(new JdkSerializationRedisSerializer());
         redisTemplate.setHashValueSerializer(new JdkSerializationRedisSerializer());

hawkbit-cache-redis/src/main/java/org/eclipse/hawkbit/cache/eventbus/EventDistributor.java

@@ -95,7 +95,7 @@ public class EventDistributor {
      *         wants to subscribe
      */
     public Collection<Topic> getTopics() {
-        final List<Topic> topics = new ArrayList<Topic>();
+        final List<Topic> topics = new ArrayList<>();
         topics.add(new PatternTopic(SUB_DISTRIBUTION_CHANNEL));
         return topics;
     }

hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java

@@ -133,18 +133,15 @@ public class AmqpMessageHandlerServiceTest {
         messageProperties.setHeader(MessageHeaderKey.THING_ID, "1");
         final Message message = messageConverter.toMessage(new byte[0], messageProperties);
 
-        // mock
         final ArgumentCaptor<String> targetIdCaptor = ArgumentCaptor.forClass(String.class);
         final ArgumentCaptor<URI> uriCaptor = ArgumentCaptor.forClass(URI.class);
         when(controllerManagementMock.findOrRegisterTargetIfItDoesNotexist(targetIdCaptor.capture(),
                 uriCaptor.capture())).thenReturn(null);
 
-        // test
         amqpMessageHandlerService.onMessage(message, MessageType.THING_CREATED.name(), TENANT);
 
-        // verify
+        assertThat(targetIdCaptor.getValue()).as("Extraxted Thing should be the same").isEqualTo(knownThingId);
-        assertThat(targetIdCaptor.getValue()).isEqualTo(knownThingId);
+        assertThat(uriCaptor.getValue().toString()).as("Extraxted Uri should be the same").isEqualTo("amqp://MyTest");
-        assertThat(uriCaptor.getValue().toString()).isEqualTo("amqp://MyTest");
 
     }
 
@@ -271,8 +268,9 @@ public class AmqpMessageHandlerServiceTest {
 
         // verify
         final DownloadResponse downloadResponse = (DownloadResponse) messageConverter.fromMessage(onMessage);
-        assertThat(downloadResponse).isNotNull();
+        assertThat(downloadResponse).as("Message body should not null").isNotNull();
-        assertThat(downloadResponse.getResponseCode()).isEqualTo(HttpStatus.NOT_FOUND.value());
+        assertThat(downloadResponse.getResponseCode()).as("Message body response code is wrong")
+                .isEqualTo(HttpStatus.NOT_FOUND.value());
     }
 
     @Test
@@ -294,8 +292,9 @@ public class AmqpMessageHandlerServiceTest {
 
         // verify
         final DownloadResponse downloadResponse = (DownloadResponse) messageConverter.fromMessage(onMessage);
-        assertThat(downloadResponse).isNotNull();
+        assertThat(downloadResponse).as("Message body should not null").isNotNull();
-        assertThat(downloadResponse.getResponseCode()).isEqualTo(HttpStatus.NOT_FOUND.value());
+        assertThat(downloadResponse.getResponseCode()).as("Message body response code is wrong")
+                .isEqualTo(HttpStatus.NOT_FOUND.value());
     }
 
     @Test
@@ -325,9 +324,10 @@ public class AmqpMessageHandlerServiceTest {
 
         // verify
         final DownloadResponse downloadResponse = (DownloadResponse) messageConverter.fromMessage(onMessage);
-        assertThat(downloadResponse).isNotNull();
+        assertThat(downloadResponse).as("Message body should not null").isNotNull();
-        assertThat(downloadResponse.getResponseCode()).isEqualTo(HttpStatus.OK.value());
+        assertThat(downloadResponse.getResponseCode()).as("Message body response code is wrong")
-        assertThat(downloadResponse.getArtifact().getSize()).isEqualTo(1L);
+                .isEqualTo(HttpStatus.OK.value());
+        assertThat(downloadResponse.getArtifact().getSize()).as("Wrong artifact size in message body").isEqualTo(1L);
         assertThat(downloadResponse.getDownloadUrl()).startsWith("http://localhost/api/v1/downloadserver/downloadId/");
     }
 
@@ -364,9 +364,11 @@ public class AmqpMessageHandlerServiceTest {
         final TargetAssignDistributionSetEvent targetAssignDistributionSetEvent = captorTargetAssignDistributionSetEvent
                 .getValue();
 
-        assertThat(targetAssignDistributionSetEvent.getControllerId()).isEqualTo("target1");
+        assertThat(targetAssignDistributionSetEvent.getControllerId()).as("event has wrong controller id")
-        assertThat(targetAssignDistributionSetEvent.getActionId()).isEqualTo(22L);
+                .isEqualTo("target1");
-        assertThat(targetAssignDistributionSetEvent.getSoftwareModules()).isEqualTo(softwareModuleList);
+        assertThat(targetAssignDistributionSetEvent.getActionId()).as("event has wrong action id").isEqualTo(22L);
+        assertThat(targetAssignDistributionSetEvent.getSoftwareModules()).as("event has wrong sofware modules")
+                .isEqualTo(softwareModuleList);
 
     }
 

hawkbit-repository/src/main/java/org/eclipse/hawkbit/report/model/ListReportSeries.java

@@ -21,7 +21,7 @@ import java.util.List;
  */
 public class ListReportSeries extends AbstractReportSeries {
 
-    private final List<Number> data = new ArrayList<Number>();
+    private final List<Number> data = new ArrayList<>();
 
     /**
      * @param name

hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DeploymentManagement.java

@@ -330,7 +330,7 @@ public class DeploymentManagement {
         // one we have been switched to canceling state because for targets
         // which we have changed to
         // canceling we don't want to publish the new action update event.
-        final Set<Long> targetIdsCancellList = new HashSet<Long>();
+        final Set<Long> targetIdsCancellList = new HashSet<>();
         targetIds.forEach(ids -> targetIdsCancellList.addAll(overrideObsoleteUpdateActions(ids)));
 
         // cancel all scheduled actions which are in-active, these actions were
@@ -435,7 +435,7 @@ public class DeploymentManagement {
      */
     private Set<Long> overrideObsoleteUpdateActions(final List<Long> targetsIds) {
 
-        final Set<Long> cancelledTargetIds = new HashSet<Long>();
+        final Set<Long> cancelledTargetIds = new HashSet<>();
 
         // Figure out if there are potential target/action combinations that
         // need to be considered
@@ -779,8 +779,7 @@ public class DeploymentManagement {
         multiselect.where(cb.equal(actionRoot.get(Action_.target), target));
         multiselect.orderBy(cb.desc(actionRoot.get(Action_.id)));
         multiselect.groupBy(actionRoot.get(Action_.id));
-        final List<ActionWithStatusCount> resultList = entityManager.createQuery(multiselect).getResultList();
+        return entityManager.createQuery(multiselect).getResultList();
-        return resultList;
     }
 
     /**

hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/NoCountPagingRepository.java

@@ -57,7 +57,7 @@ public class NoCountPagingRepository {
      */
     public <T, I extends Serializable> Slice<T> findAll(final Specification<T> spec, final Pageable pageable,
             final Class<T> domainClass) {
-        final SimpleJpaNoCountRepository<T, I> noCountDao = new SimpleJpaNoCountRepository<T, I>(domainClass, em);
+        final SimpleJpaNoCountRepository<T, I> noCountDao = new SimpleJpaNoCountRepository<>(domainClass, em);
         return noCountDao.findAll(spec, pageable);
     }
 
@@ -76,7 +76,7 @@ public class NoCountPagingRepository {
      *      org.springframework.data.domain.Pageable)
      */
     public <T, I extends Serializable> Slice<T> findAll(final Pageable pageable, final Class<T> domainClass) {
-        final SimpleJpaNoCountRepository<T, I> noCountDao = new SimpleJpaNoCountRepository<T, I>(domainClass, em);
+        final SimpleJpaNoCountRepository<T, I> noCountDao = new SimpleJpaNoCountRepository<>(domainClass, em);
         return noCountDao.findAll(pageable);
     }
 
@@ -120,7 +120,7 @@ public class NoCountPagingRepository {
 
             final List<T> content = query.getResultList();
 
-            return new PageImpl<T>(content, pageable, content.size());
+            return new PageImpl<>(content, pageable, content.size());
         }
     }
 }

hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TagManagement.java

@@ -160,7 +160,7 @@ public class TagManagement {
     public void deleteTargetTag(@NotEmpty final String targetTagName) {
         final TargetTag tag = targetTagRepository.findByNameEquals(targetTagName);
 
-        final List<Target> changed = new LinkedList<Target>();
+        final List<Target> changed = new LinkedList<>();
         for (final Target target : targetRepository.findByTag(tag)) {
             target.getTags().remove(tag);
             changed.add(target);
@@ -311,7 +311,7 @@ public class TagManagement {
     public void deleteDistributionSetTag(@NotEmpty final String tagName) {
         final DistributionSetTag tag = distributionSetTagRepository.findByNameEquals(tagName);
 
-        final List<DistributionSet> changed = new LinkedList<DistributionSet>();
+        final List<DistributionSet> changed = new LinkedList<>();
         for (final DistributionSet set : distributionSetRepository.findByTag(tag)) {
             set.getTags().remove(tag);
             changed.add(set);

hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/ActionStatus.java

@@ -63,7 +63,7 @@ public class ActionStatus extends BaseEntity {
     @CollectionTable(name = "sp_action_status_messages", joinColumns = @JoinColumn(name = "action_status_id", foreignKey = @ForeignKey(value = ConstraintMode.CONSTRAINT, name = "fk_stat_msg_act_stat") ) , indexes = {
             @Index(name = "sp_idx_action_status_msgs_01", columnList = "action_status_id") })
     @Column(name = "detail_message", length = 512)
-    private final List<String> messages = new ArrayList<String>();
+    private final List<String> messages = new ArrayList<>();
 
     /**
      * Creates a new {@link ActionStatus} object.

hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/Target.java

@@ -87,7 +87,7 @@ public class Target extends NamedEntity implements Persistable<Long> {
     @JoinTable(name = "sp_target_target_tag", joinColumns = {
             @JoinColumn(name = "target", foreignKey = @ForeignKey(value = ConstraintMode.CONSTRAINT, name = "fk_targ_targtag_target") ) }, inverseJoinColumns = {
                     @JoinColumn(name = "tag", foreignKey = @ForeignKey(value = ConstraintMode.CONSTRAINT, name = "fk_targ_targtag_tag") ) })
-    private Set<TargetTag> tags = new HashSet<TargetTag>();
+    private Set<TargetTag> tags = new HashSet<>();
 
     @CascadeOnDelete
     @OneToMany(fetch = FetchType.LAZY, orphanRemoval = true, cascade = { CascadeType.REMOVE })

hawkbit-repository/src/test/java/org/eclipse/hawkbit/MethodSecurityUtil.java

@@ -54,7 +54,7 @@ public class MethodSecurityUtil {
             if (!METHOD_SECURITY_EXCLUSION.contains(method.getName()) && !method.isSynthetic()
                     && Modifier.isPublic(method.getModifiers())) {
                 final PreAuthorize annotation = method.getAnnotation(PreAuthorize.class);
-                assertThat(annotation).describedAs(
+                assertThat(annotation).as(
                         "The public method " + method.getName() + " is not annoated with @PreAuthorize, security leak?")
                         .isNotNull();
             }

hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/DeploymentManagementTest.java

@@ -19,7 +19,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
 
 import org.eclipse.hawkbit.AbstractIntegrationTest;
 import org.eclipse.hawkbit.Constants;
@@ -98,8 +97,9 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
         final List<ActionWithStatusCount> findActionsWithStatusCountByTarget = deploymentManagement
                 .findActionsWithStatusCountByTargetOrderByIdDesc(testTarget.get(0));
 
-        assertThat(findActionsWithStatusCountByTarget).hasSize(1);
+        assertThat(findActionsWithStatusCountByTarget).as("wrong action size").hasSize(1);
-        assertThat(findActionsWithStatusCountByTarget.get(0).getActionStatusCount()).isEqualTo(3L);
+        assertThat(findActionsWithStatusCountByTarget.get(0).getActionStatusCount()).as("wrong action status size")
+                .isEqualTo(3L);
     }
 
     @Test
@@ -115,27 +115,32 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
         final DistributionSetTag tag = tagManagement.createDistributionSetTag(new DistributionSetTag("Tag1"));
 
         final List<DistributionSet> assignedDS = distributionSetManagement.assignTag(assignDS, tag);
-        assertThat(assignedDS.size()).isEqualTo(4);
+        assertThat(assignedDS.size()).as("assigned ds has wrong size").isEqualTo(4);
-        assignedDS.forEach(ds -> assertThat(ds.getTags().size()).isEqualTo(1));
+        assignedDS.forEach(ds -> assertThat(ds.getTags().size()).as("ds has wrong tag size").isEqualTo(1));
 
         DistributionSetTag findDistributionSetTag = tagManagement.findDistributionSetTag("Tag1");
-        assertThat(assignedDS.size()).isEqualTo(findDistributionSetTag.getAssignedToDistributionSet().size());
+        assertThat(assignedDS.size()).as("assigned ds has wrong size")
+                .isEqualTo(findDistributionSetTag.getAssignedToDistributionSet().size());
 
-        assertThat(distributionSetManagement.unAssignTag(Long.valueOf(100), findDistributionSetTag)).isNull();
+        assertThat(distributionSetManagement.unAssignTag(Long.valueOf(100), findDistributionSetTag))
+                .as("unassign tag result should be null").isNull();
 
         final DistributionSet unAssignDS = distributionSetManagement.unAssignTag(assignDS.get(0),
                 findDistributionSetTag);
-        assertThat(unAssignDS.getId()).isEqualTo(assignDS.get(0));
+        assertThat(unAssignDS.getId()).as("unassigned ds is wrong").isEqualTo(assignDS.get(0));
-        assertThat(unAssignDS.getTags().size()).isEqualTo(0);
+        assertThat(unAssignDS.getTags().size()).as("unassigned ds has wrong tag size").isEqualTo(0);
         findDistributionSetTag = tagManagement.findDistributionSetTag("Tag1");
-        assertThat(findDistributionSetTag.getAssignedToDistributionSet().size()).isEqualTo(3);
+        assertThat(findDistributionSetTag.getAssignedToDistributionSet().size()).as("ds tag ds has wrong ds size")
+                .isEqualTo(3);
 
         final List<DistributionSet> unAssignTargets = distributionSetManagement
                 .unAssignAllDistributionSetsByTag(findDistributionSetTag);
         findDistributionSetTag = tagManagement.findDistributionSetTag("Tag1");
-        assertThat(findDistributionSetTag.getAssignedToDistributionSet().size()).isEqualTo(0);
+        assertThat(findDistributionSetTag.getAssignedToDistributionSet().size()).as("ds tag has wrong ds size")
-        assertThat(unAssignTargets.size()).isEqualTo(3);
+                .isEqualTo(0);
-        unAssignTargets.forEach(target -> assertThat(target.getTags().size()).isEqualTo(0));
+        assertThat(unAssignTargets.size()).as("unassigned target has wrong size").isEqualTo(3);
+        unAssignTargets
+                .forEach(target -> assertThat(target.getTags().size()).as("target has wrong tag size").isEqualTo(0));
     }
 
     @Test
@@ -157,7 +162,8 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
 
         targetManagement.findAllTargetIds().forEach(targetIdName -> {
             assertThat(deploymentManagement.findActiveActionsByTarget(
-                    targetManagement.findTargetByControllerID(targetIdName.getControllerId()))).hasSize(2);
+                    targetManagement.findTargetByControllerID(targetIdName.getControllerId())))
+                            .as("active action has wrong size").hasSize(2);
         });
     }
 
@@ -180,14 +186,14 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
 
         // check initial status
         assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus())
-                .isEqualTo(TargetUpdateStatus.UNKNOWN);
+                .as("target has update status").isEqualTo(TargetUpdateStatus.UNKNOWN);
 
         // assign the two sets in a row
         Action firstAction = assignSet(target, dsFirst);
         Action secondAction = assignSet(target, dsSecond);
 
-        assertThat(actionRepository.findAll()).hasSize(2);
+        assertThat(actionRepository.findAll()).as("wrong size of actions").hasSize(2);
-        assertThat(actionStatusRepository.findAll()).hasSize(2);
+        assertThat(actionStatusRepository.findAll()).as("wrong size of action status").hasSize(2);
 
         // we cancel second -> back to first
         deploymentManagement.cancelAction(secondAction,
@@ -197,10 +203,11 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
         secondAction.setStatus(Status.CANCELED);
         controllerManagement.addCancelActionStatus(
                 new ActionStatus(secondAction, Status.CANCELED, System.currentTimeMillis()), secondAction);
-        assertThat(actionStatusRepository.findAll()).hasSize(4);
+        assertThat(actionStatusRepository.findAll()).as("wrong size of actions status").hasSize(4);
-        assertThat(targetManagement.findTargetByControllerID("4712").getAssignedDistributionSet()).isEqualTo(dsFirst);
+        assertThat(targetManagement.findTargetByControllerID("4712").getAssignedDistributionSet()).as("wrong ds")
+                .isEqualTo(dsFirst);
         assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus())
-                .isEqualTo(TargetUpdateStatus.PENDING);
+                .as("wrong update status").isEqualTo(TargetUpdateStatus.PENDING);
 
         // we cancel first -> back to installed
         deploymentManagement.cancelAction(firstAction,
@@ -210,11 +217,11 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
         firstAction.setStatus(Status.CANCELED);
         controllerManagement.addCancelActionStatus(
                 new ActionStatus(firstAction, Status.CANCELED, System.currentTimeMillis()), firstAction);
-        assertThat(actionStatusRepository.findAll()).hasSize(6);
+        assertThat(actionStatusRepository.findAll()).as("wrong size of action status").hasSize(6);
         assertThat(targetManagement.findTargetByControllerID("4712").getAssignedDistributionSet())
-                .isEqualTo(dsInstalled);
+                .as("wrong assigned ds").isEqualTo(dsInstalled);
         assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus())
-                .isEqualTo(TargetUpdateStatus.IN_SYNC);
+                .as("wrong update status").isEqualTo(TargetUpdateStatus.IN_SYNC);
     }
 
     @Test
@@ -236,14 +243,14 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
 
         // check initial status
         assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus())
-                .isEqualTo(TargetUpdateStatus.UNKNOWN);
+                .as("wrong update status").isEqualTo(TargetUpdateStatus.UNKNOWN);
 
         // assign the two sets in a row
         Action firstAction = assignSet(target, dsFirst);
         Action secondAction = assignSet(target, dsSecond);
 
-        assertThat(actionRepository.findAll()).hasSize(2);
+        assertThat(actionRepository.findAll()).as("wrong size of actions").hasSize(2);
-        assertThat(actionStatusRepository.findAll()).hasSize(2);
+        assertThat(actionStatusRepository.findAll()).as("wrong size of action status").hasSize(2);
 
         // we cancel first -> second is left
         deploymentManagement.cancelAction(firstAction,
@@ -253,26 +260,28 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
         firstAction.setStatus(Status.CANCELED);
         controllerManagement.addCancelActionStatus(
                 new ActionStatus(firstAction, Status.CANCELED, System.currentTimeMillis()), firstAction);
-        assertThat(actionStatusRepository.findAll()).hasSize(4);
+        assertThat(actionStatusRepository.findAll()).as("wrong size of action status").hasSize(4);
-        assertThat(targetManagement.findTargetByControllerID("4712").getAssignedDistributionSet()).isEqualTo(dsSecond);
+        assertThat(targetManagement.findTargetByControllerID("4712").getAssignedDistributionSet())
+                .as("wrong assigned ds").isEqualTo(dsSecond);
         assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus())
-                .isEqualTo(TargetUpdateStatus.PENDING);
+                .as("wrong target update status").isEqualTo(TargetUpdateStatus.PENDING);
 
         // we cancel second -> remain assigned until finished cancellation
         deploymentManagement.cancelAction(secondAction,
                 targetManagement.findTargetByControllerID(target.getControllerId()));
         secondAction = deploymentManagement.findActionWithDetails(secondAction.getId());
-        assertThat(actionStatusRepository.findAll()).hasSize(5);
+        assertThat(actionStatusRepository.findAll()).as("wrong size of action status").hasSize(5);
-        assertThat(targetManagement.findTargetByControllerID("4712").getAssignedDistributionSet()).isEqualTo(dsSecond);
+        assertThat(targetManagement.findTargetByControllerID("4712").getAssignedDistributionSet())
+                .as("wrong assigned ds").isEqualTo(dsSecond);
         // confirm cancellation
         secondAction.setStatus(Status.CANCELED);
         controllerManagement.addCancelActionStatus(
                 new ActionStatus(secondAction, Status.CANCELED, System.currentTimeMillis()), secondAction);
         // cancelled success -> back to dsInstalled
         assertThat(targetManagement.findTargetByControllerID("4712").getAssignedDistributionSet())
-                .isEqualTo(dsInstalled);
+                .as("wrong installed ds").isEqualTo(dsInstalled);
         assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus())
-                .isEqualTo(TargetUpdateStatus.IN_SYNC);
+                .as("wrong target info update status").isEqualTo(TargetUpdateStatus.IN_SYNC);
     }
 
     @Test
@@ -291,13 +300,13 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
 
         // verify initial status
         assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus())
-                .isEqualTo(TargetUpdateStatus.UNKNOWN);
+                .as("wrong target info update status").isEqualTo(TargetUpdateStatus.UNKNOWN);
 
         Action assigningAction = assignSet(target, ds);
 
         // verify assignment
-        assertThat(actionRepository.findAll()).hasSize(1);
+        assertThat(actionRepository.findAll()).as("wrong size of action").hasSize(1);
-        assertThat(actionStatusRepository.findAll()).hasSize(1);
+        assertThat(actionStatusRepository.findAll()).as("wrong size of action status").hasSize(1);
 
         target = targetManagement.findTargetByControllerID(target.getControllerId());
 
@@ -310,11 +319,11 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
         assigningAction = deploymentManagement.findActionWithDetails(assigningAction.getId());
 
         // verify
-        assertThat(assigningAction.getStatus()).isEqualTo(Status.CANCELED);
+        assertThat(assigningAction.getStatus()).as("wrong size of status").isEqualTo(Status.CANCELED);
         assertThat(targetManagement.findTargetByControllerID("4712").getAssignedDistributionSet())
-                .isEqualTo(dsInstalled);
+                .as("wrong assigned ds").isEqualTo(dsInstalled);
         assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus())
-                .isEqualTo(TargetUpdateStatus.IN_SYNC);
+                .as("wrong target update status").isEqualTo(TargetUpdateStatus.IN_SYNC);
     }
 
     @Test
@@ -333,13 +342,13 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
 
         // verify initial status
         assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus())
-                .isEqualTo(TargetUpdateStatus.UNKNOWN);
+                .as("wrong update status").isEqualTo(TargetUpdateStatus.UNKNOWN);
 
         final Action assigningAction = assignSet(target, ds);
 
         // verify assignment
-        assertThat(actionRepository.findAll()).hasSize(1);
+        assertThat(actionRepository.findAll()).as("wrong size of action").hasSize(1);
-        assertThat(actionStatusRepository.findAll()).hasSize(1);
+        assertThat(actionStatusRepository.findAll()).as("wrong size of action status").hasSize(1);
 
         // force quit assignment
         try {
@@ -354,11 +363,11 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
         deploymentManagement.assignDistributionSet(ds.getId(), new String[] { target.getControllerId() });
         assertThat(
                 targetManagement.findTargetByControllerID(target.getControllerId()).getTargetInfo().getUpdateStatus())
-                        .isEqualTo(TargetUpdateStatus.PENDING);
+                        .as("wrong update status").isEqualTo(TargetUpdateStatus.PENDING);
         assertThat(targetManagement.findTargetByControllerID(target.getControllerId()).getAssignedDistributionSet())
-                .isEqualTo(ds);
+                .as("wrong assigned ds").isEqualTo(ds);
         final Action action = actionRepository.findByTargetAndDistributionSet(pageReq, target, ds).getContent().get(0);
-        assertThat(action).isNotNull();
+        assertThat(action).as("action should not be null").isNotNull();
         return action;
     }
 
@@ -390,26 +399,30 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
         deploymentManagement.assignDistributionSet(ds, savedDeployedTargets);
 
         // verify that one Action for each assignDistributionSet
-        assertThat(actionRepository.findAll(pageReq).getNumberOfElements()).isEqualTo(20);
+        assertThat(actionRepository.findAll(pageReq).getNumberOfElements()).as("wrong size of actions").isEqualTo(20);
 
         final Iterable<Target> allFoundTargets = targetManagement.findTargetsAll(pageReq).getContent();
 
-        assertThat(allFoundTargets).containsAll(savedDeployedTargets).containsAll(savedNakedTargets);
+        assertThat(allFoundTargets).as("founded targets are wrong").containsAll(savedDeployedTargets)
-        assertThat(savedDeployedTargets).doesNotContain(Iterables.toArray(savedNakedTargets, Target.class));
+                .containsAll(savedNakedTargets);
-        assertThat(savedNakedTargets).doesNotContain(Iterables.toArray(savedDeployedTargets, Target.class));
+        assertThat(savedDeployedTargets).as("saved target are wrong")
+                .doesNotContain(Iterables.toArray(savedNakedTargets, Target.class));
+        assertThat(savedNakedTargets).as("saved target are wrong")
+                .doesNotContain(Iterables.toArray(savedDeployedTargets, Target.class));
 
         for (final Target myt : savedNakedTargets) {
             final Target t = targetManagement.findTargetByControllerID(myt.getControllerId());
-            assertThat(deploymentManagement.findActionsByTarget(t)).isEmpty();
+            assertThat(deploymentManagement.findActionsByTarget(t)).as("action should be empty").isEmpty();
         }
 
         for (final Target myt : savedDeployedTargets) {
             final Target t = targetManagement.findTargetByControllerID(myt.getControllerId());
             final List<Action> activeActionsByTarget = deploymentManagement.findActiveActionsByTarget(t);
-            assertThat(activeActionsByTarget).isNotEmpty();
+            assertThat(activeActionsByTarget).as("action should not be empty").isNotEmpty();
-            assertThat(t.getTargetInfo().getUpdateStatus()).isEqualTo(TargetUpdateStatus.PENDING);
+            assertThat(t.getTargetInfo().getUpdateStatus()).as("wrong target update status")
+                    .isEqualTo(TargetUpdateStatus.PENDING);
             for (final Action ua : activeActionsByTarget) {
-                assertThat(ua.getDistributionSet()).isEqualTo(ds);
+                assertThat(ua.getDistributionSet()).as("action has wrong ds").isEqualTo(ds);
             }
         }
 
@@ -448,12 +461,13 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
         // give some chance to receive events asynchronously
         Thread.sleep(300);
         final List<TargetAssignDistributionSetEvent> events = eventHandlerMock.getEvents(1, TimeUnit.MILLISECONDS);
-        assertThat(events).isEmpty();
+        assertThat(events).as("events should be empty").isEmpty();
 
         final EventHandlerMock eventHandlerMockAfterCompletionOfDs = new EventHandlerMock(10);
         eventBus.register(eventHandlerMockAfterCompletionOfDs);
 
-        assertThat(deploymentManagement.assignDistributionSet(nowComplete, targets).getAssigned()).isEqualTo(10);
+        assertThat(deploymentManagement.assignDistributionSet(nowComplete, targets).getAssigned())
+                .as("assign ds doesn't work").isEqualTo(10);
         assertTargetAssignDistributionSetEvents(targets, nowComplete,
                 eventHandlerMockAfterCompletionOfDs.getEvents(10, TimeUnit.SECONDS));
     }
@@ -493,7 +507,8 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
         // retrieving all Actions created by the assignDistributionSet call
         final Page<Action> page = actionRepository.findAll(pageReq);
         // and verify the number
-        assertThat(page.getTotalElements()).isEqualTo(noOfDeployedTargets * noOfDistributionSets);
+        assertThat(page.getTotalElements()).as("wrong size of actions")
+                .isEqualTo(noOfDeployedTargets * noOfDistributionSets);
 
         // only records retrieved from the DB can be evaluated to be sure that
         // all fields are
@@ -504,17 +519,20 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
         final Iterable<Target> undeployedTargetsFromDB = targetRepository.findAll(undeployedTargetIDs);
 
         // test that number of Targets
-        assertThat(allFoundTargets.spliterator().getExactSizeIfKnown())
+        assertThat(allFoundTargets.spliterator().getExactSizeIfKnown()).as("number of target is wrong")
                 .isEqualTo(deployedTargetsFromDB.spliterator().getExactSizeIfKnown()
                         + undeployedTargetsFromDB.spliterator().getExactSizeIfKnown());
-        assertThat(deployedTargetsFromDB.spliterator().getExactSizeIfKnown()).isEqualTo(noOfDeployedTargets);
+        assertThat(deployedTargetsFromDB.spliterator().getExactSizeIfKnown()).as("number of target is wrong")
-        assertThat(undeployedTargetsFromDB.spliterator().getExactSizeIfKnown()).isEqualTo(noOfUndeployedTargets);
+                .isEqualTo(noOfDeployedTargets);
+        assertThat(undeployedTargetsFromDB.spliterator().getExactSizeIfKnown()).as("number of target is wrong")
+                .isEqualTo(noOfUndeployedTargets);
 
         // test the content of different lists
-        assertThat(allFoundTargets).containsAll(deployedTargetsFromDB).containsAll(undeployedTargetsFromDB);
+        assertThat(allFoundTargets).as("content of founded target is wrong").containsAll(deployedTargetsFromDB)
-        assertThat(deployedTargetsFromDB).containsAll(savedDeployedTargets)
+                .containsAll(undeployedTargetsFromDB);
+        assertThat(deployedTargetsFromDB).as("content of deployed target is wrong").containsAll(savedDeployedTargets)
                 .doesNotContain(Iterables.toArray(undeployedTargetsFromDB, Target.class));
-        assertThat(undeployedTargetsFromDB).containsAll(savedNakedTargets)
+        assertThat(undeployedTargetsFromDB).as("content of undeployed target is wrong").containsAll(savedNakedTargets)
                 .doesNotContain(Iterables.toArray(deployedTargetsFromDB, Target.class));
 
         // For each of the 4 targets 1 distribution sets gets assigned
@@ -542,42 +560,42 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
         final DistributionSet dsC = deployResWithDsC.getDistributionSets().get(0);
 
         // retrieving the UpdateActions created by the assignments
-        final Action updActA = actionRepository.findByDistributionSet(pageRequest, dsA).getContent().get(0);
+        actionRepository.findByDistributionSet(pageRequest, dsA).getContent().get(0);
-        final Action updActB = actionRepository.findByDistributionSet(pageRequest, dsB).getContent().get(0);
+        actionRepository.findByDistributionSet(pageRequest, dsB).getContent().get(0);
-        final Action updActC = actionRepository.findByDistributionSet(pageRequest, dsC).getContent().get(0);
+        actionRepository.findByDistributionSet(pageRequest, dsC).getContent().get(0);
 
         // verifying the correctness of the assignments
         for (final Target t : deployResWithDsA.getDeployedTargets()) {
-            assertThat(t.getAssignedDistributionSet().getId()).isEqualTo(dsA.getId());
+            assertThat(t.getAssignedDistributionSet().getId()).as("assignment is not correct").isEqualTo(dsA.getId());
             assertThat(targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo()
-                    .getInstalledDistributionSet()).isNull();
+                    .getInstalledDistributionSet()).as("installed ds should be null").isNull();
         }
         for (final Target t : deployResWithDsB.getDeployedTargets()) {
-            assertThat(t.getAssignedDistributionSet().getId()).isEqualTo(dsB.getId());
+            assertThat(t.getAssignedDistributionSet().getId()).as("assigned ds is wrong").isEqualTo(dsB.getId());
             assertThat(targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo()
-                    .getInstalledDistributionSet()).isNull();
+                    .getInstalledDistributionSet()).as("installed ds should be null").isNull();
         }
         for (final Target t : deployResWithDsC.getDeployedTargets()) {
             assertThat(t.getAssignedDistributionSet().getId()).isEqualTo(dsC.getId());
             assertThat(targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo()
-                    .getInstalledDistributionSet()).isNull();
+                    .getInstalledDistributionSet()).as("installed ds should not be null").isNull();
             assertThat(targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo().getUpdateStatus())
-                    .isEqualTo(TargetUpdateStatus.PENDING);
+                    .as("wrong target info update status").isEqualTo(TargetUpdateStatus.PENDING);
         }
 
         final List<Target> updatedTsDsA = sendUpdateActionStatusToTargets(dsA, deployResWithDsA.getDeployedTargets(),
                 Status.FINISHED, new String[] { "alles gut" });
 
         // verify, that dsA is deployed correctly
-        assertThat(updatedTsDsA).isEqualTo(deployResWithDsA.getDeployedTargets());
+        assertThat(updatedTsDsA).as("ds is not deployed correctly").isEqualTo(deployResWithDsA.getDeployedTargets());
         for (final Target t_ : updatedTsDsA) {
             final Target t = targetManagement.findTargetByControllerID(t_.getControllerId());
-            assertThat(t.getAssignedDistributionSet()).isEqualTo(dsA);
+            assertThat(t.getAssignedDistributionSet()).as("assigned ds is wrong").isEqualTo(dsA);
             assertThat(targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo()
-                    .getInstalledDistributionSet()).isEqualTo(dsA);
+                    .getInstalledDistributionSet()).as("installed ds is wrong").isEqualTo(dsA);
             assertThat(targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo().getUpdateStatus())
-                    .isEqualTo(TargetUpdateStatus.IN_SYNC);
+                    .as("wrong target info update status").isEqualTo(TargetUpdateStatus.IN_SYNC);
-            assertThat(deploymentManagement.findActiveActionsByTarget(t)).hasSize(0);
+            assertThat(deploymentManagement.findActiveActionsByTarget(t)).as("no actions should be active").hasSize(0);
         }
 
         // deploy dsA to the target which already have dsB deployed -> must
@@ -586,18 +604,18 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
         // UpdateAction for dsA
         final Iterable<Target> deployed2DS = deploymentManagement
                 .assignDistributionSet(dsA, deployResWithDsB.getDeployedTargets()).getAssignedTargets();
-        final Action updActA2 = actionRepository.findByDistributionSet(pageRequest, dsA).getContent().get(1);
+        actionRepository.findByDistributionSet(pageRequest, dsA).getContent().get(1);
 
-        assertThat(deployed2DS).containsAll(deployResWithDsB.getDeployedTargets());
+        assertThat(deployed2DS).as("deployed ds is wrong").containsAll(deployResWithDsB.getDeployedTargets());
-        assertThat(deployed2DS).hasSameSizeAs(deployResWithDsB.getDeployedTargets());
+        assertThat(deployed2DS).as("deployed ds is wrong").hasSameSizeAs(deployResWithDsB.getDeployedTargets());
 
         for (final Target t_ : deployed2DS) {
             final Target t = targetManagement.findTargetByControllerID(t_.getControllerId());
-            assertThat(t.getAssignedDistributionSet()).isEqualTo(dsA);
+            assertThat(t.getAssignedDistributionSet()).as("assigned ds is wrong").isEqualTo(dsA);
             assertThat(targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo()
-                    .getInstalledDistributionSet()).isNull();
+                    .getInstalledDistributionSet()).as("installed ds should be null").isNull();
             assertThat(targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo().getUpdateStatus())
-                    .isEqualTo(TargetUpdateStatus.PENDING);
+                    .as("wrong target info update status").isEqualTo(TargetUpdateStatus.PENDING);
 
         }
     }
@@ -630,22 +648,22 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
 
         distributionSetManagement.deleteDistributionSet(dsA.getId());
         dsA = distributionSetManagement.findDistributionSetById(dsA.getId());
-        assertThat(dsA).isNull();
+        assertThat(dsA).as("ds should be null").isNull();
 
         // // verify that the ds is not physically deleted
         for (final DistributionSet ds : deploymentResult.getDistributionSets()) {
             distributionSetManagement.deleteDistributionSet(ds.getId());
             final DistributionSet foundDS = distributionSetManagement.findDistributionSetById(ds.getId());
-            assertThat(foundDS).isNotNull();
+            assertThat(foundDS).as("founded should not be null").isNotNull();
-            assertThat(foundDS.isDeleted()).isTrue();
+            assertThat(foundDS.isDeleted()).as("founded ds should be deleted").isTrue();
         }
 
         // verify that deleted attribute is used correctly
         List<DistributionSet> allFoundDS = distributionSetManagement.findDistributionSetsAll(pageReq, false, true)
                 .getContent();
-        assertThat(allFoundDS.size()).isEqualTo(0);
+        assertThat(allFoundDS.size()).as("no ds should be founded").isEqualTo(0);
         allFoundDS = distributionSetManagement.findDistributionSetsAll(pageRequest, true, true).getContent();
-        assertThat(allFoundDS).hasSize(noOfDistributionSets);
+        assertThat(allFoundDS).as("wrong size of founded ds").hasSize(noOfDistributionSets);
 
         for (final DistributionSet ds : deploymentResult.getDistributionSets()) {
             sendUpdateActionStatusToTargets(ds, deploymentResult.getDeployedTargets(), Status.FINISHED,
@@ -659,9 +677,9 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
         // successfully and no activeAction is referring to created distribution
         // sets
         allFoundDS = distributionSetManagement.findDistributionSetsAll(pageRequest, false, true).getContent();
-        assertThat(allFoundDS.size()).isEqualTo(0);
+        assertThat(allFoundDS.size()).as("no ds should be founded").isEqualTo(0);
         allFoundDS = distributionSetManagement.findDistributionSetsAll(pageRequest, true, true).getContent();
-        assertThat(allFoundDS).hasSize(noOfDistributionSets);
+        assertThat(allFoundDS).as("size of founded ds is wrong").hasSize(noOfDistributionSets);
 
     }
 
@@ -685,15 +703,15 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
                     "blabla alles gut");
         }
 
-        assertThat(targetManagement.countTargetsAll()).isNotZero();
+        assertThat(targetManagement.countTargetsAll()).as("size of targets is wrong").isNotZero();
-        assertThat(actionStatusRepository.count()).isNotZero();
+        assertThat(actionStatusRepository.count()).as("size of action status is wrong").isNotZero();
 
         targetManagement
                 .deleteTargets(deploymentResult.getUndeployedTargetIDs().toArray(new Long[noOfUndeployedTargets]));
         targetManagement.deleteTargets(deploymentResult.getDeployedTargetIDs().toArray(new Long[noOfDeployedTargets]));
 
-        assertThat(targetManagement.countTargetsAll()).isZero();
+        assertThat(targetManagement.countTargetsAll()).as("size of targets should be zero").isZero();
-        assertThat(actionStatusRepository.count()).isZero();
+        assertThat(actionStatusRepository.count()).as("size of action status is wrong").isZero();
     }
 
     private List<Target> sendUpdateActionStatusToTargets(final DistributionSet dsA, final Iterable<Target> targs,
@@ -744,7 +762,7 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
         // checking the revisions of the created entities
         // verifying that the revision of the object and the revision within the
         // DB has not changed
-        assertThat(dsA.getOptLockRevision()).isEqualTo(
+        assertThat(dsA.getOptLockRevision()).as("lock revision is wrong").isEqualTo(
                 distributionSetManagement.findDistributionSetByIdWithDetails(dsA.getId()).getOptLockRevision());
 
         // verifying that the assignment is correct
@@ -795,12 +813,11 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
     public void checkThatDsRevisionsIsNotChangedWithTargetAssignment() {
         final DistributionSet dsA = TestDataUtil.generateDistributionSet("a", softwareManagement,
                 distributionSetManagement);
-        final DistributionSet dsB = TestDataUtil.generateDistributionSet("b", softwareManagement,
+        TestDataUtil.generateDistributionSet("b", softwareManagement, distributionSetManagement);
-                distributionSetManagement);
         Target targ = targetManagement
                 .createTarget(TestDataUtil.buildTargetFixture("target-id-A", "first description"));
 
-        assertThat(dsA.getOptLockRevision()).isEqualTo(
+        assertThat(dsA.getOptLockRevision()).as("lock revision is wrong").isEqualTo(
                 distributionSetManagement.findDistributionSetByIdWithDetails(dsA.getId()).getOptLockRevision());
 
         final List<Target> targs = new ArrayList<Target>();
@@ -808,7 +825,7 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
         final Iterable<Target> savedTargs = deploymentManagement.assignDistributionSet(dsA, targs).getAssignedTargets();
         targ = savedTargs.iterator().next();
 
-        assertThat(dsA.getOptLockRevision()).isEqualTo(
+        assertThat(dsA.getOptLockRevision()).as("lock revision is wrong").isEqualTo(
                 distributionSetManagement.findDistributionSetByIdWithDetails(dsA.getId()).getOptLockRevision());
     }
 
@@ -825,14 +842,14 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
         final Action action = deploymentManagement.findActionWithDetails(assignDistributionSet.getActions().get(0));
         // verify preparation
         Action findAction = deploymentManagement.findAction(action.getId());
-        assertThat(findAction.getActionType()).isEqualTo(ActionType.SOFT);
+        assertThat(findAction.getActionType()).as("action type is wrong").isEqualTo(ActionType.SOFT);
 
         // test
         deploymentManagement.forceTargetAction(action.getId());
 
         // verify test
         findAction = deploymentManagement.findAction(action.getId());
-        assertThat(findAction.getActionType()).isEqualTo(ActionType.FORCED);
+        assertThat(findAction.getActionType()).as("action type is wrong").isEqualTo(ActionType.FORCED);
     }
 
     @Test
@@ -848,15 +865,15 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
         final Action action = deploymentManagement.findActionWithDetails(assignDistributionSet.getActions().get(0));
         // verify perparation
         Action findAction = deploymentManagement.findAction(action.getId());
-        assertThat(findAction.getActionType()).isEqualTo(ActionType.FORCED);
+        assertThat(findAction.getActionType()).as("action type is wrong").isEqualTo(ActionType.FORCED);
 
         // test
         final Action forceTargetAction = deploymentManagement.forceTargetAction(action.getId());
 
         // verify test
-        assertThat(forceTargetAction.getActionType()).isEqualTo(ActionType.FORCED);
+        assertThat(forceTargetAction.getActionType()).as("action type is wrong").isEqualTo(ActionType.FORCED);
         findAction = deploymentManagement.findAction(action.getId());
-        assertThat(findAction.getActionType()).isEqualTo(ActionType.FORCED);
+        assertThat(findAction.getActionType()).as("action type is wrong").isEqualTo(ActionType.FORCED);
     }
 
     /**
@@ -918,14 +935,14 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
                 if (event.getControllerId().equals(myt.getControllerId())) {
                     found = true;
                     final List<Action> activeActionsByTarget = deploymentManagement.findActiveActionsByTarget(myt);
-                    assertThat(activeActionsByTarget).isNotEmpty();
+                    assertThat(activeActionsByTarget).as("size of active actions for target is wrong").isNotEmpty();
-                    assertThat(event.getActionId()).isEqualTo(activeActionsByTarget.get(0).getId())
+                    assertThat(event.getActionId()).as("Action id in database and event do not match")
-                            .as("Action id in database and event do not match");
+                            .isEqualTo(activeActionsByTarget.get(0).getId());
-                    assertThat(event.getSoftwareModules())
+                    assertThat(event.getSoftwareModules()).as("softwaremodule size is not correct")
                             .containsOnly(ds.getModules().toArray(new SoftwareModule[ds.getModules().size()]));
                 }
             }
-            assertThat(found).isTrue().as("No event found for controller " + myt.getControllerId());
+            assertThat(found).as("No event found for controller " + myt.getControllerId()).isTrue();
         }
     }
 
@@ -944,42 +961,19 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
         private final List<Target> deployedTargets = new ArrayList<Target>();
         private final List<DistributionSet> distributionSets = new ArrayList<DistributionSet>();
 
-        private final String undeployedTargetPrefix;
-        private final String deployedTargetPrefix;
-        private final String distributionSetPrefix;
-
         public DeploymentResult(final Iterable<Target> deployedTs, final Iterable<Target> undeployedTs,
                 final Iterable<DistributionSet> dss, final String deployedTargetPrefix,
                 final String undeployedTargetPrefix, final String distributionSetPrefix) {
 
-            this.undeployedTargetPrefix = undeployedTargetPrefix;
-            this.deployedTargetPrefix = deployedTargetPrefix;
-            this.distributionSetPrefix = distributionSetPrefix;
-
             Iterables.addAll(deployedTargets, deployedTs);
             Iterables.addAll(undeployedTargets, undeployedTs);
             Iterables.addAll(distributionSets, dss);
 
-            deployedTargets.forEach(new Consumer<Target>() {
+            deployedTargets.forEach(t -> deployedTargetIDs.add(t.getId()));
-                @Override
-                public void accept(final Target t) {
-                    deployedTargetIDs.add(t.getId());
-                }
-            });
 
-            undeployedTargets.forEach(new Consumer<Target>() {
+            undeployedTargets.forEach(t -> undeployedTargetIDs.add(t.getId()));
-                @Override
-                public void accept(final Target t) {
-                    undeployedTargetIDs.add(t.getId());
-                }
-            });
 
-            distributionSets.forEach(new Consumer<DistributionSet>() {
+            distributionSets.forEach(ds -> distributionSetIDs.add(ds.getId()));
-                @Override
-                public void accept(final DistributionSet ds) {
-                    distributionSetIDs.add(ds.getId());
-                }
-            });
 
         }
 
@@ -1018,27 +1012,6 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
             return deployedTargets;
         }
 
-        /**
-         * @return the noOfUndeployedTargets
-         */
-        public int getNoOfUndeployedTargets() {
-            return undeployedTargetIDs.size();
-        }
-
-        /**
-         * @return the noOfDeployedTargets
-         */
-        public int getNoOfDeployedTargets() {
-            return deployedTargetIDs.size();
-        }
-
-        /**
-         * @return the noOfDistributionSets
-         */
-        public int getNoOfDistributionSets() {
-            return distributionSets.size();
-        }
-
         /**
          * @return the undeployedTargetIDs
          */
@@ -1046,26 +1019,6 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
             return undeployedTargetIDs;
         }
 
-        /**
-         * @return the undeployedTargetPrefix
-         */
-        public String getUndeployedTargetPrefix() {
-            return undeployedTargetPrefix;
-        }
-
-        /**
-         * @return the deployedTargetPrefix
-         */
-        public String getDeployedTargetPrefix() {
-            return deployedTargetPrefix;
-        }
-
-        /**
-         * @return the distributionSetPrefix
-         */
-        public String getDistributionSetPrefix() {
-            return distributionSetPrefix;
-        }
     }
 
     private static class EventHandlerMock {
@@ -1090,9 +1043,9 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
             latch.await(timeout, unit);
             final List<TargetAssignDistributionSetEvent> handledEvents = new LinkedList<TargetAssignDistributionSetEvent>(
                     events);
-            assertThat(handledEvents).hasSize(expectedNumberOfEvents)
+            assertThat(handledEvents).as("Did not receive the expected amount of events (" + expectedNumberOfEvents
-                    .as("Did not receive the expected amount of events (" + expectedNumberOfEvents
+                    + ") within timeout. Received events are " + handledEvents).hasSize(expectedNumberOfEvents);
-                            + ") within timeout. Received events are " + handledEvents);
+
             return handledEvents;
         }
     }
@@ -1118,9 +1071,8 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
                 throws InterruptedException {
             latch.await(timeout, unit);
             final List<CancelTargetAssignmentEvent> handledEvents = new LinkedList<CancelTargetAssignmentEvent>(events);
-            assertThat(handledEvents).hasSize(expectedNumberOfEvents)
+            assertThat(handledEvents).as("Did not receive the expected amount of events (" + expectedNumberOfEvents
-                    .as("Did not receive the expected amount of events (" + expectedNumberOfEvents
+                    + ") within timeout. Received events are " + handledEvents).hasSize(expectedNumberOfEvents);
-                            + ") within timeout. Received events are " + handledEvents);
             return handledEvents;
         }
     }

hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/ReportManagementTest.java

@@ -18,7 +18,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
-import java.util.concurrent.Callable;
 import java.util.stream.Collectors;
 
 import org.eclipse.hawkbit.AbstractIntegrationTest;
@@ -96,7 +95,8 @@ public class ReportManagementTest extends AbstractIntegrationTest {
         // +1 because we go back #maxMonthBackAmountReportTargets but in the
         // report the current month
         // is included for sure, so from this month we go back
-        assertThat(targetsCreatedOverPeriod.getData()).hasSize(maxMonthBackAmountReportTargets + 1);
+        assertThat(targetsCreatedOverPeriod.getData()).as("created over period has wrong size")
+                .hasSize(maxMonthBackAmountReportTargets + 1);
         for (final DataReportSeriesItem<LocalDate> reportItem : targetsCreatedOverPeriod.getData()) {
             // only one target is created for each month
             assertThat(reportItem.getData().intValue()).as("Target for each month").isEqualTo(1);
@@ -147,10 +147,11 @@ public class ReportManagementTest extends AbstractIntegrationTest {
         // +1 because we go back #maxMonthBackAmountReportTargets but in the
         // report the current month
         // is included for sure, so from this month we go back
-        assertThat(feedbackReceivedOverTime.getData()).hasSize(maxMonthBackAmountReportTargets + 1);
+        assertThat(feedbackReceivedOverTime.getData()).as("feedback receiver has wrong data size")
+                .hasSize(maxMonthBackAmountReportTargets + 1);
         for (final DataReportSeriesItem<LocalDate> reportItem : feedbackReceivedOverTime.getData()) {
             // only one target feedback is created for each month
-            assertThat(reportItem.getData().intValue()).isEqualTo(1);
+            assertThat(reportItem.getData().intValue()).as("data size is wrong").isEqualTo(1);
         }
 
         // check cache evict
@@ -165,7 +166,7 @@ public class ReportManagementTest extends AbstractIntegrationTest {
         }
         feedbackReceivedOverTime = reportManagement.feedbackReceivedOverTime(DateTypes.perMonth(), from, to);
         for (final DataReportSeriesItem<LocalDate> reportItem : feedbackReceivedOverTime.getData()) {
-            assertThat(reportItem.getData().intValue()).isEqualTo(2);
+            assertThat(reportItem.getData().intValue()).as("report item has wrong data size").isEqualTo(2);
         }
 
     }
@@ -227,12 +228,12 @@ public class ReportManagementTest extends AbstractIntegrationTest {
                         .isEqualTo(3L);
                 final DataReportSeriesItem<String>[] outerData = innerOuterDataReportSeries.getOuterSeries().getData();
                 assertThat(Arrays.stream(outerData).map(DataReportSeriesItem::getType).collect(Collectors.toList()))
-                        .contains("0.0.0", "0.0.1");
+                        .as("versio item contains wrong version").contains("0.0.0", "0.0.1");
             } else if (dataReportSeriesItem.getType().equals("ds2")) {
                 assertThat(dataReportSeriesItem.getData()).as("Version/Item type of DistributionSet 2 in statistics")
                         .isEqualTo(1L);
                 final DataReportSeriesItem<String>[] outerData = innerOuterDataReportSeries.getOuterSeries().getData();
-                assertThat(outerData).hasSize(1);
+                assertThat(outerData).as("Version/Item type has wrong size").hasSize(1);
                 assertThat(outerData[0].getType()).as("Version/Item type of DistributionSet 2 in statistics")
                         .isEqualTo("0.0.2");
             } else if (dataReportSeriesItem.getType().equals("ds3")) {
@@ -240,7 +241,7 @@ public class ReportManagementTest extends AbstractIntegrationTest {
                 assertThat(dataReportSeriesItem.getData()).as("Version/Item type of DistributionSet 3 in statistics")
                         .isEqualTo(0L);
                 final DataReportSeriesItem<String>[] outerData = innerOuterDataReportSeries.getOuterSeries().getData();
-                assertThat(outerData).hasSize(1);
+                assertThat(outerData).as("Version/Item type has wrong size").hasSize(1);
                 assertThat(outerData[0].getType()).as("Version/Item type of DistributionSet 3 in statistics")
                         .isEqualTo("0.0.3");
             } else {
@@ -395,13 +396,13 @@ public class ReportManagementTest extends AbstractIntegrationTest {
 
                 final DataReportSeriesItem<String>[] outerData = innerOuterDataReportSeries.getOuterSeries().getData();
                 assertThat(Arrays.stream(outerData).map(DataReportSeriesItem::getType).collect(Collectors.toList()))
-                        .contains("0.0.0", "0.0.1");
+                        .as("Out series contains wrong version").contains("0.0.0", "0.0.1");
 
             } else if (dataReportSeriesItem.getType().equals("ds2")) {
                 assertThat(dataReportSeriesItem.getData()).as("Total count of DistributionSet 2 in statistics")
                         .isEqualTo(1L);
                 final DataReportSeriesItem<String>[] outerData = innerOuterDataReportSeries.getOuterSeries().getData();
-                assertThat(outerData).hasSize(1);
+                assertThat(outerData).as("out series has wrong size").hasSize(1);
                 assertThat(outerData[0].getType()).as("Version/Item type of DistributionSet 2 in statistics")
                         .isEqualTo("0.0.2");
 
@@ -409,7 +410,7 @@ public class ReportManagementTest extends AbstractIntegrationTest {
                 assertThat(dataReportSeriesItem.getData()).as("Total count of DistributionSet 3 in statistics")
                         .isEqualTo(0L);
                 final DataReportSeriesItem<String>[] outerData = innerOuterDataReportSeries.getOuterSeries().getData();
-                assertThat(outerData).hasSize(1);
+                assertThat(outerData).as("out series has wrong size").hasSize(1);
                 assertThat(outerData[0].getType()).as("Version/Item type of DistributionSet 3 in statistics")
                         .isEqualTo("0.0.3");
             } else {
@@ -487,33 +488,26 @@ public class ReportManagementTest extends AbstractIntegrationTest {
         final int targetCreateAmount = 10;
 
         // create targets for another tenant
-        securityRule.runAs(WithSpringAuthorityRule.withUserAndTenant("user", "anotherTenant"), new Callable<Void>() {
+        securityRule.runAs(WithSpringAuthorityRule.withUserAndTenant("user", "anotherTenant"), () -> {
-            @Override
+            for (int index = 0; index < targetCreateAmount; index++) {
-            public Void call() throws Exception {
+                targetManagement.createTarget(new Target("t" + index));
-                for (int index = 0; index < targetCreateAmount; index++) {
-                    targetManagement.createTarget(new Target("t" + index));
-                }
-                return null;
             }
+            return null;
         });
 
         // ensure targets has been created for 'anotherTenant'
         final Slice<Target> targetsForAnotherTenant = securityRule.runAs(
-                WithSpringAuthorityRule.withUserAndTenant("user", "anotherTenant"), new Callable<Slice<Target>>() {
+                WithSpringAuthorityRule.withUserAndTenant("user", "anotherTenant"),
-                    @Override
+                () -> targetManagement.findTargetsAll(new PageRequest(0, 1000)));
-                    public Slice<Target> call() throws Exception {
+        assertThat(targetsForAnotherTenant).as("targets has wrong size").hasSize(targetCreateAmount);
-                        return targetManagement.findTargetsAll(new PageRequest(0, 1000));
-                    }
-                });
-        assertThat(targetsForAnotherTenant).hasSize(targetCreateAmount);
 
         final LocalDateTime to = LocalDateTime.now();
         final LocalDateTime from = to.minusMonths(targetCreateAmount);
         // now retrieve the report for the 'mytenant'
         final DataReportSeries<LocalDate> targetsCreatedOverPeriod = reportManagement
                 .targetsCreatedOverPeriod(DateTypes.perMonth(), from, to);
-        // final no targets should final be created for this tenant
+        assertThat(targetsCreatedOverPeriod.getData()).as("final no targets should final be created for this tenant")
-        assertThat(targetsCreatedOverPeriod.getData()).hasSize(0);
+                .hasSize(0);
 
     }
 

hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/rest/resource/DistributionSetTypeMapper.java

@@ -88,7 +88,7 @@ final class DistributionSetTypeMapper {
     }
 
     static List<DistributionSetTypeRest> toListResponse(final List<DistributionSetType> types) {
-        final List<DistributionSetTypeRest> response = new ArrayList<DistributionSetTypeRest>();
+        final List<DistributionSetTypeRest> response = new ArrayList<>();
         for (final DistributionSetType dsType : types) {
             response.add(toResponse(dsType));
         }

hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/rest/resource/SoftwareModuleTypeMapper.java

@@ -59,7 +59,7 @@ final class SoftwareModuleTypeMapper {
     }
 
     static List<SoftwareModuleTypeRest> toListResponse(final Collection<SoftwareModuleType> types) {
-        final List<SoftwareModuleTypeRest> response = new ArrayList<SoftwareModuleTypeRest>();
+        final List<SoftwareModuleTypeRest> response = new ArrayList<>();
         for (final SoftwareModuleType softwareModule : types) {
             response.add(toResponse(softwareModule));
         }

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java

@@ -208,14 +208,13 @@ public class ArtifactDetailsLayout extends VerticalLayout {
     }
 
     private Container createArtifactLazyQueryContainer() {
-        final Map<String, Object> queryConfiguration = new HashMap<String, Object>();
+        final Map<String, Object> queryConfiguration = new HashMap<>();
         return getArtifactLazyQueryContainer(queryConfiguration);
     }
 
     private LazyQueryContainer getArtifactLazyQueryContainer(final Map<String, Object> queryConfig) {
 
-        final BeanQueryFactory<ArtifactBeanQuery> artifactQF = new BeanQueryFactory<ArtifactBeanQuery>(
+        final BeanQueryFactory<ArtifactBeanQuery> artifactQF = new BeanQueryFactory<>(ArtifactBeanQuery.class);
-                ArtifactBeanQuery.class);
         artifactQF.setQueryConfiguration(queryConfig);
         final LazyQueryContainer artifactCont = new LazyQueryContainer(new LazyQueryDefinition(true, 10, "id"),
                 artifactQF);
@@ -431,7 +430,7 @@ public class ArtifactDetailsLayout extends VerticalLayout {
                 titleOfArtifactDetails.setContentMode(ContentMode.HTML);
             }
         }
-        final Map<String, Object> queryConfiguration = new HashMap<String, Object>();
+        final Map<String, Object> queryConfiguration = new HashMap<>();
         if (baseSwModuleId != null) {
             queryConfiguration.put(SPUIDefinitions.BY_BASE_SOFTWARE_MODULE, baseSwModuleId);
         }

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/event/UploadViewAcceptCriteria.java

@@ -47,12 +47,6 @@ public class UploadViewAcceptCriteria extends AbstractAcceptCriteria {
     @Autowired
     private transient EventBus.SessionEventBus eventBus;
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.AbstractAcceptCriteria#analyseDragComponent
-     * (com.vaadin.event .dd.DragAndDropEvent, com.vaadin.ui.Component)
-     */
     @Override
     protected void analyseDragComponent(final Component compsource) {
         final String sourceID = getComponentId(compsource);
@@ -60,24 +54,11 @@ public class UploadViewAcceptCriteria extends AbstractAcceptCriteria {
         eventBus.publish(this, event);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.AbstractAcceptCriteria#hideDropHints
-     * ()
-     */
     @Override
     protected void hideDropHints() {
         eventBus.publish(this, DragEvent.HIDE_DROP_HINT);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.AbstractAcceptCriteria#invalidDrop()
-     */
     @Override
     protected void invalidDrop() {
         uiNotification.displayValidationError(SPUILabelDefinitions.ACTION_NOT_ALLOWED);
@@ -92,41 +73,23 @@ public class UploadViewAcceptCriteria extends AbstractAcceptCriteria {
         return id;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.AbstractAcceptCriteria#
-     * getDropHintConfigurations()
-     */
     @Override
     protected Map<String, Object> getDropHintConfigurations() {
         return DROP_HINTS_CONFIGS;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.AbstractAcceptCriteria#
-     * publishDragStartEvent(java.lang.Object)
-     */
     @Override
     protected void publishDragStartEvent(final Object event) {
         eventBus.publish(this, event);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.AbstractAcceptCriteria#
-     * getDropConfigurations()
-     */
     @Override
     protected Map<String, List<String>> getDropConfigurations() {
         return DROP_CONFIGS;
     }
 
     private static Map<String, List<String>> createDropConfigurations() {
-        final Map<String, List<String>> config = new HashMap<String, List<String>>();
+        final Map<String, List<String>> config = new HashMap<>();
         // Delete drop area droppable components
         config.put(SPUIComponetIdProvider.DELETE_BUTTON_WRAPPER_ID, Arrays.asList(
                 SPUIComponetIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE, SPUIComponetIdProvider.UPLOAD_TYPE_BUTTON_PREFIX));
@@ -135,7 +98,7 @@ public class UploadViewAcceptCriteria extends AbstractAcceptCriteria {
     }
 
     private static Map<String, Object> createDropHintConfigurations() {
-        final Map<String, Object> config = new HashMap<String, Object>();
+        final Map<String, Object> config = new HashMap<>();
         config.put(SPUIComponetIdProvider.UPLOAD_TYPE_BUTTON_PREFIX, UploadArtifactUIEvent.SOFTWARE_TYPE_DRAG_START);
         config.put(SPUIComponetIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE, UploadArtifactUIEvent.SOFTWARE_DRAG_START);
         return config;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/SMDeleteActionsLayout.java

@@ -37,8 +37,8 @@ import com.vaadin.spring.annotation.ViewScope;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Table;
-import com.vaadin.ui.UI;
 import com.vaadin.ui.Table.TableTransferable;
+import com.vaadin.ui.UI;
 
 /**
  * Upload view footer layout implementation.
@@ -71,12 +71,7 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
     @Autowired
     private UploadViewAcceptCriteria uploadViewAcceptCriteria;
 
-    /*
+    @Override
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.DeleteActionsLayout#init()
-     */
     @PostConstruct
     protected void init() {
         super.init();
@@ -134,23 +129,11 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.footer.DeleteActionsLayout#
-     * hasDeletePermission()
-     */
     @Override
     protected boolean hasDeletePermission() {
         return permChecker.hasDeleteDistributionPermission();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.footer.DeleteActionsLayout#
-     * hasUpdatePermission()
-     */
     @Override
     protected boolean hasUpdatePermission() {
         /**
@@ -161,12 +144,6 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
         return false;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.footer.DeleteActionsLayout#
-     * getDeleteAreaLabel()
-     */
     @Override
     protected String getDeleteAreaLabel() {
         return i18n.get("label.software.module.drop.area");
@@ -177,29 +154,17 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
         return SPUIComponetIdProvider.DELETE_BUTTON_WRAPPER_ID;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.footer.DeleteActionsLayout#
-     * getDeleteLayoutAcceptCriteria()
-     */
     @Override
     protected AcceptCriterion getDeleteLayoutAcceptCriteria() {
         return uploadViewAcceptCriteria;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.footer.DeleteActionsLayout#
-     * processDroppedComponent(com.vaadin .event.dd.DragAndDropEvent)
-     */
     @Override
     protected void processDroppedComponent(final DragAndDropEvent event) {
         final Component sourceComponent = event.getTransferable().getSourceComponent();
         if (sourceComponent instanceof Table) {
             final Table sourceTable = (Table) event.getTransferable().getSourceComponent();
-            addToDeleteList(sourceTable,(TableTransferable) event.getTransferable());
+            addToDeleteList(sourceTable, (TableTransferable) event.getTransferable());
             updateSWActionCount();
         }
         if (sourceComponent.getId().startsWith(SPUIComponetIdProvider.UPLOAD_TYPE_BUTTON_PREFIX)) {
@@ -223,11 +188,11 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
     private void deleteSWModuleType(final String swModuleTypeName) {
         artifactUploadState.getSelectedDeleteSWModuleTypes().add(swModuleTypeName);
     }
-   
+
     private void addToDeleteList(final Table sourceTable, final TableTransferable transferable) {
         @SuppressWarnings("unchecked")
         final Set<Long> swModuleSelected = (Set<Long>) sourceTable.getValue();
-        final Set<Long> swModuleIdNameSet = new HashSet<Long>();
+        final Set<Long> swModuleIdNameSet = new HashSet<>();
         if (!swModuleSelected.contains(transferable.getData(SPUIDefinitions.ITEMID))) {
             swModuleIdNameSet.add((Long) transferable.getData(SPUIDefinitions.ITEMID));
         } else {
@@ -239,33 +204,18 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
             artifactUploadState.getDeleteSofwareModules().put(id, swModuleName);
         });
     }
-  
+
-    /**
-     * Update the software module delete count.
-     */
     private void updateSWActionCount() {
         final int count = artifactUploadState.getDeleteSofwareModules().size()
                 + artifactUploadState.getSelectedDeleteSWModuleTypes().size();
         updateActionsCount(count);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.footer.DeleteActionsLayout#
-     * getNoActionsButtonLabel()
-     */
     @Override
     protected String getNoActionsButtonLabel() {
         return i18n.get("button.no.actions");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.footer.DeleteActionsLayout#
-     * getActionsButtonLabel()
-     */
     @Override
     protected String getActionsButtonLabel() {
         return i18n.get("button.actions");
@@ -276,25 +226,11 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
         updateSWActionCount();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
-     * getUnsavedActionsWindowCaption ()
-     */
     @Override
     protected String getUnsavedActionsWindowCaption() {
         return i18n.get("caption.save.window");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
-     * unsavedActionsWindowClosed()
-     */
     @Override
     protected void unsavedActionsWindowClosed() {
         final String message = uploadViewConfirmationWindowLayout.getConsolidatedMessage();
@@ -303,26 +239,12 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
-     * getUnsavedActionsWindowContent ()
-     */
     @Override
     protected Component getUnsavedActionsWindowContent() {
         uploadViewConfirmationWindowLayout.init();
         return uploadViewConfirmationWindowLayout;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
-     * hasUnsavedActions()
-     */
     @Override
     protected boolean hasUnsavedActions() {
         return !artifactUploadState.getDeleteSofwareModules().isEmpty()
@@ -339,23 +261,11 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.ui.common.footer.AbstractDeleteActionsLayout#
-     * isBulkUploadAllowed()
-     */
     @Override
     protected boolean hasBulkUploadPermission() {
         return false;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.ui.common.footer.AbstractDeleteActionsLayout#
-     * showBulkUploadWindow()
-     */
     @Override
     protected void showBulkUploadWindow() {
         /**
@@ -363,12 +273,6 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
          */
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.ui.common.footer.AbstractDeleteActionsLayout#
-     * restoreBulkUploadStatusCount()
-     */
     @Override
     protected void restoreBulkUploadStatusCount() {
         /**

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/BaseSwModuleBeanQuery.java

@@ -32,10 +32,6 @@ import com.google.common.base.Strings;
  * Simple implementation of generics bean query which dynamically loads a batch
  * of beans.
  *
- *
- *
- *
- *
  */
 public class BaseSwModuleBeanQuery extends AbstractBeanQuery<ProxyBaseSoftwareModuleItem> {
     private static final long serialVersionUID = 4362142538539335466L;
@@ -76,7 +72,7 @@ public class BaseSwModuleBeanQuery extends AbstractBeanQuery<ProxyBaseSoftwareMo
     @Override
     protected List<ProxyBaseSoftwareModuleItem> loadBeans(final int startIndex, final int count) {
         final Slice<SoftwareModule> swModuleBeans;
-        final List<ProxyBaseSoftwareModuleItem> proxyBeans = new ArrayList<ProxyBaseSoftwareModuleItem>();
+        final List<ProxyBaseSoftwareModuleItem> proxyBeans = new ArrayList<>();
 
         if (type == null && Strings.isNullOrEmpty(searchText)) {
             swModuleBeans = getSoftwareManagementService()

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java

@@ -70,6 +70,7 @@ public class SoftwareModuleDetails extends AbstractTableDetailsLayout {
     /**
      * Initialize the component.
      */
+    @Override
     @PostConstruct
     protected void init() {
         super.init();

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java

@@ -55,8 +55,6 @@ import com.vaadin.ui.UI;
 /**
  * Header of Software module table.
  *
- *
- *
  */
 @SpringComponent
 @ViewScope
@@ -78,11 +76,11 @@ public class SoftwareModuleTable extends AbstractTable {
 
     @Autowired
     private UploadViewAcceptCriteria uploadViewAcceptCriteria;
-    
+
- 
     /**
      * Initialize the filter layout.
      */
+    @Override
     @PostConstruct
     protected void init() {
         super.init();
@@ -111,36 +109,23 @@ public class SoftwareModuleTable extends AbstractTable {
         });
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.SPTable#getTableId()
-     */
     @Override
     protected String getTableId() {
         return SPUIComponetIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.SPTable#createContainer()
-     */
     @Override
     protected Container createContainer() {
         final Map<String, Object> queryConfiguration = prepareQueryConfigFilters();
 
-        final BeanQueryFactory<BaseSwModuleBeanQuery> swQF = new BeanQueryFactory<BaseSwModuleBeanQuery>(
+        final BeanQueryFactory<BaseSwModuleBeanQuery> swQF = new BeanQueryFactory<>(BaseSwModuleBeanQuery.class);
-                BaseSwModuleBeanQuery.class);
         swQF.setQueryConfiguration(queryConfiguration);
 
-        final LazyQueryContainer container = new LazyQueryContainer(
+        return new LazyQueryContainer(new LazyQueryDefinition(true, SPUIDefinitions.PAGE_SIZE, "swId"), swQF);
-                new LazyQueryDefinition(true, SPUIDefinitions.PAGE_SIZE, "swId"), swQF);
-        return container;
     }
-    
+
     private Map<String, Object> prepareQueryConfigFilters() {
-        final Map<String, Object> queryConfig = new HashMap<String, Object>();
+        final Map<String, Object> queryConfig = new HashMap<>();
         artifactUploadState.getSoftwareModuleFilters().getSearchText()
                 .ifPresent(value -> queryConfig.put(SPUIDefinitions.FILTER_BY_TEXT, value));
 
@@ -149,8 +134,6 @@ public class SoftwareModuleTable extends AbstractTable {
 
         return queryConfig;
     }
-    
-    
 
     @Override
     protected void addContainerProperties(final Container container) {
@@ -274,16 +257,9 @@ public class SoftwareModuleTable extends AbstractTable {
         select(swModule.getId());
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.SPTable#getTableVisibleColumns
-     * ()
-     */
     @Override
     protected List<TableColumn> getTableVisibleColumns() {
-        final List<TableColumn> columnList = new ArrayList<TableColumn>();
+        final List<TableColumn> columnList = new ArrayList<>();
         if (isMaximized()) {
             columnList.add(new TableColumn(SPUILabelDefinitions.VAR_NAME, i18n.get("header.name"), 0.2F));
             columnList.add(new TableColumn(SPUILabelDefinitions.VAR_VERSION, i18n.get("header.version"), 0.1F));

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java

@@ -62,6 +62,7 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
     /**
      * Initialize the components.
      */
+    @Override
     @PostConstruct
     protected void init() {
         super.init();
@@ -84,55 +85,26 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
         eventbus.unsubscribe(this);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getHeaderCaption
-     * ()
-     */
     @Override
     protected String getHeaderCaption() {
         return i18n.get("upload.swModuleTable.header");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getSearchBoxId()
-     */
     @Override
     protected String getSearchBoxId() {
         return SPUIComponetIdProvider.SW_MODULE_SEARCH_TEXT_FIELD;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.SPTableHeader#getSearchRestIconId()
-     */
     @Override
     protected String getSearchRestIconId() {
         return SPUIComponetIdProvider.SW_MODULE_SEARCH_RESET_ICON;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getAddIconId()
-     */
     @Override
     protected String getAddIconId() {
         return SPUIComponetIdProvider.SW_MODULE_ADD_BUTTON;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.SPTableHeader#onLoadSearchBoxValue()
-     */
     @Override
     protected String onLoadSearchBoxValue() {
         if (artifactUploadState.getSoftwareModuleFilters().getSearchText().isPresent()) {
@@ -141,68 +113,34 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getDropFilterId(
-     * )
-     */
     @Override
     protected String getDropFilterId() {
         /* No dropping on software module table header in Upload View */
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.SPTableHeader#hasCreatePermission()
-     */
     @Override
     protected boolean hasCreatePermission() {
         return permChecker.hasCreateDistributionPermission();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.SPTableHeader#isDropHintRequired()
-     */
     @Override
     protected boolean isDropHintRequired() {
         /* No dropping on software module table header in Upload View */
         return false;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.SPTableHeader#isDropFilterRequired()
-     */
     @Override
     protected boolean isDropFilterRequired() {
         /* No dropping on software module table header in Upload View */
         return false;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#
-     * getShowFilterButtonLayoutId()
-     */
     @Override
     protected String getShowFilterButtonLayoutId() {
         return "show.type.icon";
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.SPTableHeader#showFilterButtonsLayout
-     * ()
-     */
     @Override
     protected void showFilterButtonsLayout() {
         artifactUploadState.setSwTypeFilterClosed(false);
@@ -210,39 +148,19 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#resetSearchText(
-     * )
-     */
     @Override
     protected void resetSearchText() {
-        if(artifactUploadState.getSoftwareModuleFilters().getSearchText().isPresent()){
+        if (artifactUploadState.getSoftwareModuleFilters().getSearchText().isPresent()) {
             artifactUploadState.getSoftwareModuleFilters().setSearchText(null);
             eventbus.publish(this, SMFilterEvent.REMOVER_FILTER_BY_TEXT);
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getMaxMinIconId(
-     * )
-     */
     @Override
     protected String getMaxMinIconId() {
         return SPUIComponetIdProvider.SW_MAX_MIN_TABLE_ICON;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#maximizeTable()
-     */
     @Override
     public void maximizeTable() {
         artifactUploadState.setSwModuleTableMaximized(Boolean.TRUE);
@@ -250,58 +168,28 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#minimizeTable()
-     */
     @Override
     public void minimizeTable() {
         artifactUploadState.setSwModuleTableMaximized(Boolean.FALSE);
         eventbus.publish(this, new SoftwareModuleEvent(SoftwareModuleEventType.MINIMIZED, null));
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.SPTableHeader#onLoadIsTableMaximized(
-     * )
-     */
     @Override
     public Boolean onLoadIsTableMaximized() {
         return artifactUploadState.isSwModuleTableMaximized();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#
-     * onLoadIsShowFilterButtonDisplayed()
-     */
     @Override
     public Boolean onLoadIsShowFilterButtonDisplayed() {
         return artifactUploadState.isSwTypeFilterClosed();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.SPTableHeader#searchBy(java.lang.
-     * String)
-     */
     @Override
     protected void searchBy(final String newSearchText) {
         artifactUploadState.getSoftwareModuleFilters().setSearchText(newSearchText);
         eventbus.publish(this, SMFilterEvent.FILTER_BY_TEXT);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.SPTableHeader#addNewItem(com.vaadin.
-     * ui.Button.ClickEvent)
-     */
     @Override
     protected void addNewItem(final ClickEvent event) {
         final Window addSoftwareModule = softwareModuleAddUpdateWindow.createAddSoftwareModuleWindow();
@@ -310,11 +198,6 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
         addSoftwareModule.setVisible(Boolean.TRUE);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#canAddNewItem()
-     */
     @Override
     protected Boolean isAddNewItemAllowed() {
         return Boolean.TRUE;
@@ -335,47 +218,21 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * getBulkUploadIconId()
-     */
     @Override
     protected String getBulkUploadIconId() {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#bulkUpload(com.
-     * vaadin.ui.Button.ClickEvent )
-     */
     @Override
     protected void bulkUpload(final ClickEvent event) {
-        /**
+        // No implementation as no bulk upload is supported.
-         * No implementation as no bulk upload is supported.
-         */
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * isBulkUploadAllowed()
-     */
     @Override
     protected Boolean isBulkUploadAllowed() {
         return Boolean.FALSE;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.ui.common.table.AbstractTableHeader#
-     * isBulkUploadInProgress()
-     */
     @Override
     protected boolean isBulkUploadInProgress() {
         return false;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java

@@ -193,7 +193,7 @@ public class CreateUpdateSoftwareTypeLayout extends CustomComponent implements C
         getPreviewButtonColor(DEFAULT_COLOR);
         tagColorPreviewBtn.setStyleName(TAG_DYNAMIC_STYLE);
 
-        selectors = new HashSet<ColorSelector>();
+        selectors = new HashSet<>();
         selectedColor = new Color(44, 151, 32);
         selPreview = new SpColorPickerPreview(selectedColor);
 
@@ -741,38 +741,17 @@ public class CreateUpdateSoftwareTypeLayout extends CustomComponent implements C
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.vaadin.ui.components.colorpicker.HasColorChangeListener#
-     * addColorChangeListener(com.vaadin
-     * .ui.components.colorpicker.ColorChangeListener)
-     */
     @Override
     public void addColorChangeListener(final ColorChangeListener listener) {
         LOG.debug("inside addColorChangeListener");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.vaadin.ui.components.colorpicker.HasColorChangeListener#
-     * removeColorChangeListener(com.
-     * vaadin.ui.components.colorpicker.ColorChangeListener)
-     */
     @Override
     public void removeColorChangeListener(final ColorChangeListener listener) {
         LOG.debug("inside removeColorChangeListener");
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.vaadin.ui.components.colorpicker.ColorSelector#setColor(com.vaadin.
-     * shared.ui.colorpicker .Color)
-     */
     @Override
     public void setColor(final Color color) {
         if (color == null) {
@@ -788,23 +767,11 @@ public class CreateUpdateSoftwareTypeLayout extends CustomComponent implements C
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.vaadin.ui.components.colorpicker.ColorSelector#getColor()
-     */
     @Override
     public Color getColor() {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.vaadin.ui.components.colorpicker.ColorChangeListener#colorChanged(com
-     * .vaadin.ui.components .colorpicker.ColorChangeEvent)
-     */
     @Override
     public void colorChanged(final ColorChangeEvent event) {
         setColor(event.getColor());

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtons.java

@@ -35,8 +35,6 @@ import com.vaadin.spring.annotation.ViewScope;
 /**
  * Software module type filter buttons.
  * 
- *
- * 
  */
 @SpringComponent
 @ViewScope
@@ -59,6 +57,7 @@ public class SMTypeFilterButtons extends AbstractFilterButtons {
      * @param filterButtonClickBehaviour
      *            the clickable behaviour.
      */
+    @Override
     public void init(final AbstractFilterButtonClickBehaviour filterButtonClickBehaviour) {
         super.init(filterButtonClickBehaviour);
         eventBus.subscribe(this);
@@ -86,58 +85,28 @@ public class SMTypeFilterButtons extends AbstractFilterButtons {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.layouts.SPFilterButtons#getButtonsTableId()
-     */
     @Override
     protected String getButtonsTableId() {
         return SPUIComponetIdProvider.SW_MODULE_TYPE_TABLE_ID;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.layouts.SPFilterButtons#
-     * createButtonsLazyQueryContainer()
-     */
     @Override
     protected LazyQueryContainer createButtonsLazyQueryContainer() {
         return HawkbitCommonUtil.createLazyQueryContainer(
                 new BeanQueryFactory<SoftwareModuleTypeBeanQuery>(SoftwareModuleTypeBeanQuery.class));
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.layouts.SPFilterButtons#isClickedByDefault(java.
-     * lang.Long)
-     */
     @Override
     protected boolean isClickedByDefault(final Long buttonId) {
         return artifactUploadState.getSoftwareModuleFilters().getSoftwareModuleType().isPresent() && artifactUploadState
                 .getSoftwareModuleFilters().getSoftwareModuleType().get().getId().equals(buttonId);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.layouts.SPFilterButtons#createButtonId(java.lang.
-     * String)
-     */
     @Override
     protected String createButtonId(final String name) {
         return SPUIComponetIdProvider.SM_TYPE_FILTER_BTN_ID + name;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.filterlayout.SPFilterButtons#
-     * getFilterButtonDropHandler()
-     */
     @Override
     protected DropHandler getFilterButtonDropHandler() {
         return new DropHandler() {
@@ -155,13 +124,6 @@ public class SMTypeFilterButtons extends AbstractFilterButtons {
         };
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * getButttonWrapperId()
-     */
     @Override
     protected String getButttonWrapperIdPrefix() {
         return SPUIComponetIdProvider.UPLOAD_TYPE_BUTTON_PREFIX;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterHeader.java

@@ -28,9 +28,6 @@ import com.vaadin.ui.Window;
 
 /**
  * Software module type filter buttons header.
- * 
- *
- * 
  */
 @SpringComponent
 @ViewScope
@@ -53,6 +50,7 @@ public class SMTypeFilterHeader extends AbstractFilterHeader {
     /**
      * Initialize the components.
      */
+    @Override
     @PostConstruct
     protected void init() {
         super.init();
@@ -61,32 +59,16 @@ public class SMTypeFilterHeader extends AbstractFilterHeader {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.layouts.SPFilterHeader#hasCreateUpdatePermission()
-     */
     @Override
     protected boolean hasCreateUpdatePermission() {
         return permChecker.hasCreateDistributionPermission() || permChecker.hasUpdateDistributionPermission();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.layouts.SPFilterHeader#getTitle()
-     */
     @Override
     protected String getTitle() {
         return SPUILabelDefinitions.TYPE;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.layouts.SPFilterHeader#settingsIconClicked(com.
-     * vaadin.ui.Button.ClickEvent )
-     */
     @Override
     protected void settingsIconClicked(final ClickEvent event) {
         final Window addUpdateWindow = createUpdateSWTypeLayout.getWindow();
@@ -94,58 +76,27 @@ public class SMTypeFilterHeader extends AbstractFilterHeader {
         addUpdateWindow.setVisible(Boolean.TRUE);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.layouts.SPFilterHeader#dropHitsRequired()
-     */
     @Override
     protected boolean dropHitsRequired() {
         return false;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.filterlayout.SPFilterHeader#
-     * hideFilterButtonLayout()
-     */
     @Override
     protected void hideFilterButtonLayout() {
         artifactUploadState.setSwTypeFilterClosed(true);
         eventbus.publish(this, UploadArtifactUIEvent.HIDE_FILTER_BY_TYPE);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.filterlayout.SPFilterHeader#
-     * getConfigureFilterButtonId()
-     */
     @Override
     protected String getConfigureFilterButtonId() {
         return SPUIDefinitions.ADD_SOFTWARE_MODULE_TYPE;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * getHideButtonId()
-     */
     @Override
     protected String getHideButtonId() {
         return SPUIComponetIdProvider.SM_SHOW_FILTER_BUTTON_ID;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterHeader#
-     * isAddTagRequired()
-     */
     @Override
     protected boolean isAddTagRequired() {
         return true;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadConfirmationwindow.java

@@ -56,11 +56,7 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * Artifact upload confirmation popup.
- *
+ * 
- *
- *
- *
- *
  */
 public class UploadConfirmationwindow implements Button.ClickListener {
 
@@ -106,7 +102,7 @@ public class UploadConfirmationwindow implements Button.ClickListener {
 
     private IndexedContainer tabelContainer;
 
-    private final List<UploadStatus> uploadResultList = new ArrayList<UploadStatus>();
+    private final List<UploadStatus> uploadResultList = new ArrayList<>();
 
     private VerticalLayout uploadArtifactDetails;
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java

@@ -69,8 +69,6 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * Upload files layout.
- *
- *
  */
 @ViewScope
 @SpringComponent
@@ -102,7 +100,7 @@ public class UploadLayout extends VerticalLayout {
 
     private final AtomicInteger numberOfFilesActuallyUpload = new AtomicInteger();
 
-    private final List<String> duplicateFileNamesList = new ArrayList<String>();
+    private final List<String> duplicateFileNamesList = new ArrayList<>();
 
     private Button processBtn;
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadResultWindow.java

@@ -44,7 +44,7 @@ public class UploadResultWindow implements Button.ClickListener {
 
     private static final long serialVersionUID = 5205927189362269027L;
 
-    private List<UploadStatus> uploadResultList = new ArrayList<UploadStatus>();
+    private List<UploadStatus> uploadResultList = new ArrayList<>();
 
     private Button closeBtn;
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/ConfirmationDialog.java

@@ -29,9 +29,6 @@ import com.vaadin.ui.themes.ValoTheme;
  *
  * module.
  *
- *
- *
- *
  */
 public class ConfirmationDialog implements Button.ClickListener {
     /** Serial version UID. */
@@ -127,6 +124,7 @@ public class ConfirmationDialog implements Button.ClickListener {
      * @param event
      *            the click event.
      */
+    @Override
     public void buttonClick(final ClickEvent event) {
         if (window.getParent() != null) {
             UI.getCurrent().removeWindow(window);
@@ -146,6 +144,7 @@ public class ConfirmationDialog implements Button.ClickListener {
     /**
      * Interface for confirmation dialog callbacks.
      */
+    @FunctionalInterface
     public interface ConfirmationDialogCallback {
         /**
          * The user response.

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/DistributionSetTypeBeanQuery.java

@@ -83,7 +83,7 @@ public class DistributionSetTypeBeanQuery extends AbstractBeanQuery<Distribution
     @Override
     protected List<DistributionSetType> loadBeans(final int startIndex, final int count) {
         Page<DistributionSetType> typeBeans;
-        final List<DistributionSetType> distSetTypeList = new ArrayList<DistributionSetType>();
+        final List<DistributionSetType> distSetTypeList = new ArrayList<>();
         if (startIndex == 0 && firstPageDistSetType != null) {
             typeBeans = firstPageDistSetType;
         } else {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java

@@ -45,8 +45,6 @@ import com.vaadin.ui.UI;
 
 /**
  * Implementation of target/ds tag token layout.
- * 
- *
  *
  */
 @SpringComponent
@@ -80,6 +78,7 @@ public class DistributionTagToken extends AbstractTagToken {
     // To Be Done : have to set this value based on view???
     private static final Boolean NOTAGS_SELECTED = Boolean.FALSE;
 
+    @Override
     @PostConstruct
     protected void init() {
         super.init();
@@ -88,34 +87,16 @@ public class DistributionTagToken extends AbstractTagToken {
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.tagDetails.AbstractTagToken#getTagStyleName
-     * ()
-     */
     @Override
     protected String getTagStyleName() {
         return "distribution-tag-";
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.tagDetails.AbstractTagToken#
-     * getTokenInputPrompt()
-     */
     @Override
     protected String getTokenInputPrompt() {
         return i18n.get("combo.type.tag.name");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.tagDetails.AbstractTagToken#assignTag(java.
-     * lang.String)
-     */
     @Override
     protected void assignTag(final String tagNameSelected) {
         if (tagNameSelected != null) {
@@ -129,7 +110,7 @@ public class DistributionTagToken extends AbstractTagToken {
     }
 
     private DistributionSetTagAssigmentResult toggleAssignment(final String tagNameSelected) {
-        final Set<Long> distributionList = new HashSet<Long>();
+        final Set<Long> distributionList = new HashSet<>();
         distributionList.add(selectedDS.getId());
         final DistributionSetTagAssigmentResult result = distributionSetManagement.toggleTagAssignment(distributionList,
                 tagNameSelected);
@@ -137,12 +118,6 @@ public class DistributionTagToken extends AbstractTagToken {
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.tagDetails.AbstractTagToken#unassignTag(
-     * java.lang.String)
-     */
     @Override
     protected void unassignTag(final String tagName) {
         final DistributionSetTagAssigmentResult result = toggleAssignment(tagName);
@@ -160,26 +135,14 @@ public class DistributionTagToken extends AbstractTagToken {
 
     /* To Be Done : this implementation will vary in views */
     private List<String> getClickedTagList() {
-        return new ArrayList<String>();
+        return new ArrayList<>();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.tagDetails.AbstractTagToken#
-     * hasUpdatePermission()
-     */
     @Override
     protected Boolean isToggleTagAssignmentAllowed() {
         return spChecker.hasUpdateDistributionPermission();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.tagDetails.AbstractTagToken#
-     * displayAlreadyAssignedTags()
-     */
     @Override
     public void displayAlreadyAssignedTags() {
         removePreviouslyAddedTokens();
@@ -190,12 +153,6 @@ public class DistributionTagToken extends AbstractTagToken {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.tagDetails.AbstractTagToken#
-     * populateContainer()
-     */
     @Override
     protected void populateContainer() {
         container.removeAllItems();

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStylePrimarySmall.java

@@ -14,29 +14,11 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * Style for button: Primary.
- * 
- *
- * 
- *
- * 
- *
  */
 public class SPUIButtonStylePrimarySmall implements SPUIButtonDecorator {
 
-    /**
+    @Override
-     * Decorate Button and return.
+    public Button decorate(final Button button, final String style, final boolean setStyle, final Resource icon) {
-     * 
-     * @param button
-     *            as Button
-     * @param style
-     *            as String
-     * @param setStyle
-     *            as String
-     * @param icon
-     *            as resource
-     * @return Button
-     */
-    public Button decorate(Button button, String style, boolean setStyle, Resource icon) {
         button.addStyleName(ValoTheme.BUTTON_PRIMARY + " " + ValoTheme.BUTTON_SMALL);
         // Set Style
         if (null != style) {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleSmall.java

@@ -14,29 +14,12 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * Style for button: Small.
- * 
- *
- * 
- *
- * 
  *
  */
 public class SPUIButtonStyleSmall implements SPUIButtonDecorator {
 
-    /**
+    @Override
-     * Decorate Button and return.
+    public Button decorate(final Button button, final String style, final boolean setStyle, final Resource icon) {
-     * 
-     * @param button
-     *            as Button
-     * @param style
-     *            as String
-     * @param setStyle
-     *            as String
-     * @param icon
-     *            as resource
-     * @return Button
-     */
-    public Button decorate(Button button, String style, boolean setStyle, Resource icon) {
         button.addStyleName(ValoTheme.BUTTON_SMALL);
         // Set Style
         if (null != style) {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleSmallNoBorderUH.java

@@ -14,29 +14,12 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * Style for button: Small NoBorder Height UnDefined.
- * 
- *
- * 
- *
- * 
  *
  */
 public class SPUIButtonStyleSmallNoBorderUH implements SPUIButtonDecorator {
 
-    /**
+    @Override
-     * Decorate Button and return.
+    public Button decorate(final Button button, final String style, final boolean setStyle, final Resource icon) {
-     * 
-     * @param button
-     *            as Button
-     * @param style
-     *            as String
-     * @param setStyle
-     *            as String
-     * @param icon
-     *            as resource
-     * @return Button
-     */
-    public Button decorate(Button button, String style, boolean setStyle, Resource icon) {
         button.addStyleName(ValoTheme.BUTTON_SMALL);
         button.addStyleName(ValoTheme.BUTTON_BORDERLESS_COLORED);
         button.setHeightUndefined();

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleSmallNoBorderUHS.java

@@ -14,29 +14,12 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * Style for button: Small NoBorder Height and size UnDefined.
- * 
- *
- * 
- *
- * 
  *
  */
 public class SPUIButtonStyleSmallNoBorderUHS implements SPUIButtonDecorator {
 
-    /**
+    @Override
-     * Decorate Button and return.
+    public Button decorate(final Button button, final String style, final boolean setStyle, final Resource icon) {
-     * 
-     * @param button
-     *            as Button
-     * @param style
-     *            as String
-     * @param setStyle
-     *            as String
-     * @param icon
-     *            as resource
-     * @return Button
-     */
-    public Button decorate(Button button, String style, boolean setStyle, Resource icon) {
         button.addStyleName(ValoTheme.BUTTON_SMALL);
         button.addStyleName(ValoTheme.BUTTON_BORDERLESS);
         button.setHeightUndefined();

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleTiny.java

@@ -14,29 +14,12 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * Style for button: Small.
- * 
- *
- * 
- *
- * 
  *
  */
 public class SPUIButtonStyleTiny implements SPUIButtonDecorator {
 
-    /**
+    @Override
-     * Decorate Button and return.
+    public Button decorate(final Button button, final String style, final boolean setStyle, final Resource icon) {
-     * 
-     * @param button
-     *            as Button
-     * @param style
-     *            as String
-     * @param setStyle
-     *            as String
-     * @param icon
-     *            as resource
-     * @return Button
-     */
-    public Button decorate(Button button, String style, boolean setStyle, Resource icon) {
         button.addStyleName(ValoTheme.BUTTON_TINY);
         // Set Style
         if (null != style) {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUITagButtonStyle.java

@@ -16,27 +16,10 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * Style for button: Tag.
- * 
- *
- * 
- *
- * 
- *
  */
 public class SPUITagButtonStyle implements SPUIButtonDecorator {
-    /**
+
-     * Decorate Button and return.
+    @Override
-     * 
-     * @param button
-     *            as Button
-     * @param style
-     *            as String
-     * @param setStyle
-     *            as String
-     * @param icon
-     *            as resource
-     * @return Button
-     */
     public Button decorate(final Button button, final String style, final boolean setStyle, final Resource icon) {
 
         /**

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java

@@ -79,8 +79,6 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * Window for create update Distribution Set Type.
- * 
- *
  */
 @SpringComponent
 @ViewScope
@@ -221,7 +219,7 @@ public class CreateUpdateDistSetTypeLayout extends CustomComponent implements Co
 
         getPreviewButtonColor(DEFAULT_COLOR);
 
-        selectors = new HashSet<ColorSelector>();
+        selectors = new HashSet<>();
         selectedColor = new Color(44, 151, 32);
         selPreview = new SpColorPickerPreview(selectedColor);
 
@@ -457,6 +455,7 @@ public class CreateUpdateDistSetTypeLayout extends CustomComponent implements Co
         sourceTable.setItemDescriptionGenerator(new ItemDescriptionGenerator() {
             private static final long serialVersionUID = 1L;
 
+            @Override
             public String generateDescription(final Component source, final Object itemId, final Object propertyId) {
                 final Item item = sourceTable.getItem(itemId);
                 final String description = (String) item.getItemProperty(DIST_TYPE_DESCRIPTION).getValue();
@@ -475,7 +474,7 @@ public class CreateUpdateDistSetTypeLayout extends CustomComponent implements Co
 
     @SuppressWarnings("unchecked")
     private void getSelectedTableItemData(final Long id) {
-        Item saveTblitem = null;
+        Item saveTblitem;
         if (null != selectedTablecontainer) {
             saveTblitem = selectedTablecontainer.addItem(id);
             saveTblitem.getItemProperty(DIST_TYPE_NAME).setValue(
@@ -657,10 +656,10 @@ public class CreateUpdateDistSetTypeLayout extends CustomComponent implements Co
             DistributionSetType newDistType = new DistributionSetType(typeKeyValue, typeNameValue, typeDescValue);
             for (final Long id : itemIds) {
                 final Item item = selectedTable.getItem(id);
-                final String dist_type_name = (String) item.getItemProperty(DIST_TYPE_NAME).getValue();
+                final String distTypeName = (String) item.getItemProperty(DIST_TYPE_NAME).getValue();
                 final CheckBox mandatoryCheckBox = (CheckBox) item.getItemProperty(DIST_TYPE_MANDATORY).getValue();
                 final Boolean isMandatory = mandatoryCheckBox.getValue();
-                final SoftwareModuleType swModuleType = softwareManagement.findSoftwareModuleTypeByName(dist_type_name);
+                final SoftwareModuleType swModuleType = softwareManagement.findSoftwareModuleTypeByName(distTypeName);
                 if (isMandatory) {
                     newDistType.addMandatoryModuleType(swModuleType);
 
@@ -1032,7 +1031,6 @@ public class CreateUpdateDistSetTypeLayout extends CustomComponent implements Co
      *            as the selected tag from combo
      */
     private void setTypeTagCombo(final String distSetTypeSelected) {
-        boolean mandatory = false;
         typeName.setValue(distSetTypeSelected);
         getSourceTableData();
         selectedTable.getContainerDataSource().removeAllItems();
@@ -1053,13 +1051,11 @@ public class CreateUpdateDistSetTypeLayout extends CustomComponent implements Co
                 saveDistSetType.setEnabled(false);
             }
             for (final SoftwareModuleType swModuleType : selectedTypeTag.getOptionalModuleTypes()) {
-                mandatory = false;
+                addTargetTableforUpdate(swModuleType, false);
-                addTargetTableforUpdate(swModuleType, mandatory);
             }
 
             for (final SoftwareModuleType swModuleType : selectedTypeTag.getMandatoryModuleTypes()) {
-                mandatory = true;
+                addTargetTableforUpdate(swModuleType, true);
-                addTargetTableforUpdate(swModuleType, mandatory);
             }
 
             if (null == selectedTypeTag.getColour()) {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtons.java

@@ -60,44 +60,24 @@ public class DSTypeFilterButtons extends AbstractFilterButtons {
      * @param filterButtonClickBehaviour
      *            the clickable behaviour.
      */
+    @Override
     public void init(final AbstractFilterButtonClickBehaviour filterButtonClickBehaviour) {
         super.init(filterButtonClickBehaviour);
         eventBus.subscribe(this);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * getButtonsTableId()
-     */
     @Override
     protected String getButtonsTableId() {
 
         return SPUIComponetIdProvider.DISTRIBUTION_SET_TYPE_TABLE_ID;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * createButtonsLazyQueryContainer ()
-     */
     @Override
     protected LazyQueryContainer createButtonsLazyQueryContainer() {
         return HawkbitCommonUtil.createLazyQueryContainer(
                 new BeanQueryFactory<DistributionSetTypeBeanQuery>(DistributionSetTypeBeanQuery.class));
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * isClickedByDefault(java.lang .Long)
-     */
     @Override
     protected boolean isClickedByDefault(final Long buttonId) {
 
@@ -105,26 +85,12 @@ public class DSTypeFilterButtons extends AbstractFilterButtons {
                 && manageDistUIState.getManageDistFilters().getClickedDistSetType().getId().equals(buttonId);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * createButtonId(java.lang. String)
-     */
     @Override
     protected String createButtonId(final String name) {
 
         return SPUIComponetIdProvider.DS_TYPE_FILTER_BTN_ID + name;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * getFilterButtonDropHandler()
-     */
     @Override
     protected DropHandler getFilterButtonDropHandler() {
 
@@ -148,13 +114,6 @@ public class DSTypeFilterButtons extends AbstractFilterButtons {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * getButttonWrapperId()
-     */
     @Override
     protected String getButttonWrapperIdPrefix() {
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterHeader.java

@@ -27,9 +27,6 @@ import com.vaadin.ui.Window;
 
 /**
  * Distribution Set Type filter buttons header.
- * 
- *
- * 
  */
 @SpringComponent
 @ViewScope
@@ -49,9 +46,7 @@ public class DSTypeFilterHeader extends AbstractFilterHeader {
     @Autowired
     private CreateUpdateDistSetTypeLayout createUpdateDistSetTypeLayout;
 
-    /**
+    @Override
-     * Initialize the components.
-     */
     @PostConstruct
     public void init() {
         super.init();
@@ -60,37 +55,16 @@ public class DSTypeFilterHeader extends AbstractFilterHeader {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * hasCreateUpdatePermission()
-     */
     @Override
     protected boolean hasCreateUpdatePermission() {
-
         return permChecker.hasCreateDistributionPermission() || permChecker.hasUpdateDistributionPermission();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#getTitle(
-     * )
-     */
     @Override
     protected String getTitle() {
         return SPUILabelDefinitions.TYPE;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * settingsIconClicked(com.vaadin .ui.Button.ClickEvent)
-     */
     @Override
     protected void settingsIconClicked(final ClickEvent event) {
         final Window addUpdateWindow = createUpdateDistSetTypeLayout.getWindow();
@@ -99,25 +73,11 @@ public class DSTypeFilterHeader extends AbstractFilterHeader {
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * dropHitsRequired()
-     */
     @Override
     protected boolean dropHitsRequired() {
         return false;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * hideFilterButtonLayout()
-     */
     @Override
     protected void hideFilterButtonLayout() {
         manageDistUIState.setDistTypeFilterClosed(true);
@@ -125,38 +85,17 @@ public class DSTypeFilterHeader extends AbstractFilterHeader {
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * getConfigureFilterButtonId()
-     */
     @Override
     protected String getConfigureFilterButtonId() {
 
         return SPUIDefinitions.ADD_DISTRIBUTION_TYPE_TAG;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * getHideButtonId()
-     */
     @Override
     protected String getHideButtonId() {
-
         return SPUIDefinitions.HIDE_FILTER_DIST_TYPE;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterHeader#
-     * isAddTagRequired()
-     */
     @Override
     protected boolean isAddTagRequired() {
         return true;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java

@@ -74,8 +74,6 @@ import com.vaadin.ui.UI;
 /**
  * Distribution set table.
  *
- *
- *
  */
 @SpringComponent
 @ViewScope
@@ -114,7 +112,7 @@ public class DistributionSetTable extends AbstractTable {
 
     @Autowired
     private transient TargetManagement targetManagement;
-    
+
     /**
      * Initialize the component.
      */
@@ -136,24 +134,11 @@ public class DistributionSetTable extends AbstractTable {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.AbstractTable#getTableId()
-     */
     @Override
     protected String getTableId() {
         return SPUIComponetIdProvider.DIST_TABLE_ID;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.AbstractTable#createContainer(
-     * )
-     */
     @Override
     protected Container createContainer() {
 
@@ -165,9 +150,9 @@ public class DistributionSetTable extends AbstractTable {
                 new LazyQueryDefinition(true, SPUIDefinitions.PAGE_SIZE, SPUILabelDefinitions.VAR_DIST_ID_NAME),
                 distributionQF);
     }
-    
+
     private Map<String, Object> prepareQueryConfigFilters() {
-        final Map<String, Object> queryConfig = new HashMap<String, Object>();
+        final Map<String, Object> queryConfig = new HashMap<>();
         manageDistUIState.getManageDistFilters().getSearchText()
                 .ifPresent(value -> queryConfig.put(SPUIDefinitions.FILTER_BY_TEXT, value));
 
@@ -178,14 +163,7 @@ public class DistributionSetTable extends AbstractTable {
 
         return queryConfig;
     }
-    
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see hawkbit.server.ui.common.table.AbstractTable#addContainerProperties
-     * (com.vaadin.data.Container )
-     */
     @Override
     protected void addContainerProperties(final Container container) {
         HawkbitCommonUtil.getDsTableColumnProperties(container);
@@ -193,12 +171,6 @@ public class DistributionSetTable extends AbstractTable {
                 Boolean.class, null, false, true);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTable#
-     * addCustomGeneratedColumns ()
-     */
     @Override
     protected void addCustomGeneratedColumns() {
         /**
@@ -206,23 +178,12 @@ public class DistributionSetTable extends AbstractTable {
          */
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTable#
-     * isFirstRowSelectedOnLoad ()
-     */
     @Override
     protected boolean isFirstRowSelectedOnLoad() {
         return !manageDistUIState.getSelectedDistributions().isPresent()
                 || manageDistUIState.getSelectedDistributions().get().isEmpty();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see hawkbit.server.ui.common.table.AbstractTable#getItemIdToSelect()
-     */
     @Override
     protected Object getItemIdToSelect() {
         if (manageDistUIState.getSelectedDistributions().isPresent()) {
@@ -231,12 +192,6 @@ public class DistributionSetTable extends AbstractTable {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.AbstractTable#onValueChange()
-     */
     @Override
     protected void onValueChange() {
         eventBus.publish(this, DragEvent.HIDE_DROP_HINT);
@@ -271,33 +226,16 @@ public class DistributionSetTable extends AbstractTable {
 
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.AbstractTable#isMaximized()
-     */
     @Override
     protected boolean isMaximized() {
         return manageDistUIState.isDsTableMaximized();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see hawkbit.server.ui.common.table.AbstractTable#getTableVisibleColumns
-     * ()
-     */
     @Override
     protected List<TableColumn> getTableVisibleColumns() {
         return HawkbitCommonUtil.getTableVisibleColumns(isMaximized(), false, i18n);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see hawkbit.server.ui.common.table.AbstractTable#getTableDropHandler()
-     */
     @Override
     protected DropHandler getTableDropHandler() {
         return new DropHandler() {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java

@@ -36,8 +36,6 @@ import com.vaadin.ui.Window;
 
 /**
  * Distribution table header.
- *
- *
  */
 @SpringComponent
 @ViewScope
@@ -60,9 +58,7 @@ public class DistributionSetTableHeader extends AbstractTableHeader {
     @Autowired
     private DistributionAddUpdateWindowLayout addUpdateWindowLayout;
 
-    /**
+    @Override
-     * Initialize the component.
-     */
     @PostConstruct
     protected void init() {
         super.init();
@@ -76,54 +72,26 @@ public class DistributionSetTableHeader extends AbstractTableHeader {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#getHeaderCaption(
-     * )
-     */
     @Override
     protected String getHeaderCaption() {
         return i18n.get("header.dist.table");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#getSearchBoxId()
-     */
     @Override
     protected String getSearchBoxId() {
         return SPUIComponetIdProvider.DIST_SEARCH_TEXTFIELD;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * getSearchRestIconId()
-     */
     @Override
     protected String getSearchRestIconId() {
         return SPUIComponetIdProvider.DIST_SEARCH_ICON;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#getAddIconId()
-     */
     @Override
     protected String getAddIconId() {
         return SPUIComponetIdProvider.DIST_ADD_ICON;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * onLoadSearchBoxValue()
-     */
     @Override
     protected String onLoadSearchBoxValue() {
         if (manageDistUIstate.getManageDistFilters().getSearchText().isPresent()) {
@@ -132,11 +100,6 @@ public class DistributionSetTableHeader extends AbstractTableHeader {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#getDropFilterId()
-     */
     @Override
     protected String getDropFilterId() {
         return null;
@@ -170,7 +133,7 @@ public class DistributionSetTableHeader extends AbstractTableHeader {
 
     @Override
     protected void resetSearchText() {
-        if(manageDistUIstate.getManageDistFilters().getSearchText().isPresent()){
+        if (manageDistUIstate.getManageDistFilters().getSearchText().isPresent()) {
             manageDistUIstate.getManageDistFilters().setSearchText(null);
             eventbus.publish(this, DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT);
         }
@@ -223,11 +186,6 @@ public class DistributionSetTableHeader extends AbstractTableHeader {
         eventbus.unsubscribe(this);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#canAddNewItem()
-     */
     @Override
     protected Boolean isAddNewItemAllowed() {
         return Boolean.TRUE;
@@ -248,47 +206,21 @@ public class DistributionSetTableHeader extends AbstractTableHeader {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * getBulkUploadIconId()
-     */
     @Override
     protected String getBulkUploadIconId() {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#bulkUpload(com.
-     * vaadin.ui.Button.ClickEvent )
-     */
     @Override
     protected void bulkUpload(final ClickEvent event) {
-        /**
+        // No implementation as no bulk upload is supported.
-         * No implementation as no bulk upload is supported.
-         */
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * isBulkUploadAllowed()
-     */
     @Override
     protected Boolean isBulkUploadAllowed() {
         return Boolean.FALSE;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.ui.common.table.AbstractTableHeader#
-     * isBulkUploadInProgress()
-     */
     @Override
     protected boolean isBulkUploadInProgress() {
         return false;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/ManageDistBeanQuery.java

@@ -37,8 +37,6 @@ import com.google.common.base.Strings;
 /**
  * Manage Distributions table bean query.
  *
- *
- *
  */
 public class ManageDistBeanQuery extends AbstractBeanQuery<ProxyDistribution> {
 
@@ -83,28 +81,15 @@ public class ManageDistBeanQuery extends AbstractBeanQuery<ProxyDistribution> {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.vaadin.addons.lazyquerycontainer.AbstractBeanQuery#constructBean()
-     */
     @Override
     protected ProxyDistribution constructBean() {
         return new ProxyDistribution();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.vaadin.addons.lazyquerycontainer.AbstractBeanQuery#loadBeans(int,
-     * int)
-     */
     @Override
     protected List<ProxyDistribution> loadBeans(final int startIndex, final int count) {
         Page<DistributionSet> distBeans;
-        final List<ProxyDistribution> proxyDistributions = new ArrayList<ProxyDistribution>();
+        final List<ProxyDistribution> proxyDistributions = new ArrayList<>();
         if (startIndex == 0 && firstPageDistributionSets != null) {
             distBeans = firstPageDistributionSets;
         } else if (Strings.isNullOrEmpty(searchText)) {
@@ -136,24 +121,12 @@ public class ManageDistBeanQuery extends AbstractBeanQuery<ProxyDistribution> {
         return proxyDistributions;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.vaadin.addons.lazyquerycontainer.AbstractBeanQuery#saveBeans(java.
-     * util.List, java.util.List, java.util.List)
-     */
     @Override
     protected void saveBeans(final List<ProxyDistribution> arg0, final List<ProxyDistribution> arg1,
             final List<ProxyDistribution> arg2) {
         // Add,Delete and Update are performed through repository methods
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.vaadin.addons.lazyquerycontainer.AbstractBeanQuery#size()
-     */
     @Override
     public int size() {
         if (Strings.isNullOrEmpty(searchText) && null == distributionSetType) {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/DistributionsViewAcceptCriteria.java

@@ -28,8 +28,6 @@ import com.vaadin.ui.Component;
 /**
  * Distributions View for Accept criteria.
  * 
- *
- * 
  */
 @SpringComponent
 @ViewScope
@@ -47,12 +45,6 @@ public class DistributionsViewAcceptCriteria extends AbstractAcceptCriteria {
     @Autowired
     private transient EventBus.SessionEventBus eventBus;
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.AbstractAcceptCriteria#analyseDragComponent
-     * (com.vaadin.event .dd.DragAndDropEvent, com.vaadin.ui.Component)
-     */
     @Override
     protected void analyseDragComponent(final Component compsource) {
         final String sourceID = getComponentId(compsource);
@@ -60,24 +52,11 @@ public class DistributionsViewAcceptCriteria extends AbstractAcceptCriteria {
         eventBus.publish(this, event);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.AbstractAcceptCriteria#hideDropHints
-     * ()
-     */
     @Override
     protected void hideDropHints() {
         eventBus.publish(this, DragEvent.HIDE_DROP_HINT);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.AbstractAcceptCriteria#invalidDrop()
-     */
     @Override
     protected void invalidDrop() {
         uiNotification.displayValidationError(SPUILabelDefinitions.ACTION_NOT_ALLOWED);
@@ -94,34 +73,16 @@ public class DistributionsViewAcceptCriteria extends AbstractAcceptCriteria {
         return id;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.AbstractAcceptCriteria#
-     * getDropHintConfigurations()
-     */
     @Override
     protected Map<String, Object> getDropHintConfigurations() {
         return DROP_HINTS_CONFIGS;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.AbstractAcceptCriteria#
-     * publishDragStartEvent(java.lang.Object)
-     */
     @Override
     protected void publishDragStartEvent(final Object event) {
         eventBus.publish(this, event);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.AbstractAcceptCriteria#
-     * getDropConfigurations()
-     */
     @Override
     protected Map<String, List<String>> getDropConfigurations() {
         return DROP_CONFIGS;
@@ -137,7 +98,7 @@ public class DistributionsViewAcceptCriteria extends AbstractAcceptCriteria {
     }
 
     private static Map<String, List<String>> createDropConfigurations() {
-        final Map<String, List<String>> config = new HashMap<String, List<String>>();
+        final Map<String, List<String>> config = new HashMap<>();
 
         // Delete drop area droppable components
         config.put(SPUIComponetIdProvider.DELETE_BUTTON_WRAPPER_ID,
@@ -153,7 +114,7 @@ public class DistributionsViewAcceptCriteria extends AbstractAcceptCriteria {
     }
 
     private static Map<String, Object> createDropHintConfigurations() {
-        final Map<String, Object> config = new HashMap<String, Object>();
+        final Map<String, Object> config = new HashMap<>();
         config.put(SPUIDefinitions.DISTRIBUTION_TYPE_ID_PREFIXS, DragEvent.DISTRIBUTION_TYPE_DRAG);
         config.put(SPUIComponetIdProvider.DIST_TABLE_ID, DragEvent.DISTRIBUTION_DRAG);
         config.put(SPUIComponetIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE, DragEvent.SOFTWAREMODULE_DRAG);

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleBeanQuery.java

@@ -32,9 +32,6 @@ import com.google.common.base.Strings;
 /**
  * Simple implementation of generics bean query which dynamically loads a batch
  * of beans.
- * 
- *
- *
  *
  */
 public class SwModuleBeanQuery extends AbstractBeanQuery<ProxyBaseSwModuleItem> {
@@ -77,17 +74,10 @@ public class SwModuleBeanQuery extends AbstractBeanQuery<ProxyBaseSwModuleItem>
         return new ProxyBaseSwModuleItem();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.vaadin.addons.lazyquerycontainer.AbstractBeanQuery#loadBeans(int,
-     * int)
-     */
     @Override
     protected List<ProxyBaseSwModuleItem> loadBeans(final int startIndex, final int count) {
         final Slice<CustomSoftwareModule> swModuleBeans;
-        final List<ProxyBaseSwModuleItem> proxyBeans = new ArrayList<ProxyBaseSwModuleItem>();
+        final List<ProxyBaseSwModuleItem> proxyBeans = new ArrayList<>();
 
         swModuleBeans = getSoftwareManagement().findSoftwareModuleOrderByDistribution(
                 new OffsetBasedPageRequest(startIndex, count, new Sort(Direction.ASC, "name", "version")),

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java

@@ -39,9 +39,6 @@ import com.vaadin.ui.Window;
 /**
  * Implementation of software module details block using generic abstract
  * details style .
- * 
- *
- *
  */
 @SpringComponent
 @ViewScope
@@ -70,9 +67,7 @@ public class SwModuleDetails extends AbstractTableDetailsLayout {
 
     private SoftwareModule selectedSwModule;
 
-    /**
+    @Override
-     * Initialize the component.
-     */
     @PostConstruct
     protected void init() {
         super.init();
@@ -133,49 +128,21 @@ public class SwModuleDetails extends AbstractTableDetailsLayout {
         detailsTab.addTab(createLogLayout(), i18n.get("caption.logs.tab"), null);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.detailslayout.TableDetailsLayout#
-     * getDefaultCaption()
-     */
     @Override
     protected String getDefaultCaption() {
         return i18n.get("upload.swModuleTable.header");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.detailslayout.TableDetailsLayout#
-     * onLoadIsSwModuleSelected()
-     */
     @Override
     protected Boolean onLoadIsTableRowSelected() {
         return !manageDistUIState.getSelectedSoftwareModules().isEmpty();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.detailslayout.TableDetailsLayout#
-     * onLoadIsTableMaximized()
-     */
     @Override
     protected Boolean onLoadIsTableMaximized() {
         return manageDistUIState.isSwModuleTableMaximized();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.detailslayout.TableDetailsLayout#
-     * populateDetailsWidget()
-     */
     @Override
     protected void populateDetailsWidget() {
         populateDetailsWidget(selectedSwModule);
@@ -191,12 +158,6 @@ public class SwModuleDetails extends AbstractTableDetailsLayout {
         return permissionChecker.hasUpdateDistributionPermission();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
-     * getTabSheetId()
-     */
     @Override
     protected String getTabSheetId() {
         return null;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java

@@ -67,8 +67,6 @@ import com.vaadin.ui.Window;
 
 /**
  * Implementation of software module table using generic abstract table styles .
- * 
- *
  *
  */
 @SpringComponent
@@ -94,10 +92,11 @@ public class SwModuleTable extends AbstractTable {
 
     @Autowired
     private ArtifactDetailsLayout artifactDetailsLayout;
-    
+
-   /**
+    /**
      * Initialize the filter layout.
      */
+    @Override
     @PostConstruct
     protected void init() {
         super.init();
@@ -158,56 +157,35 @@ public class SwModuleTable extends AbstractTable {
         }
     }
 
-    /* All Override methods */
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.SPTable#getTableId()
-     */
     @Override
     protected String getTableId() {
         return SPUIComponetIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.SPTable#createContainer()
-     */
     @Override
     protected Container createContainer() {
         final Map<String, Object> queryConfiguration = prepareQueryConfigFilters();
 
-        final BeanQueryFactory<SwModuleBeanQuery> swQF = new BeanQueryFactory<SwModuleBeanQuery>(
+        final BeanQueryFactory<SwModuleBeanQuery> swQF = new BeanQueryFactory<>(SwModuleBeanQuery.class);
-                SwModuleBeanQuery.class);
         swQF.setQueryConfiguration(queryConfiguration);
 
-        final LazyQueryContainer container = new LazyQueryContainer(
+        return new LazyQueryContainer(new LazyQueryDefinition(true, SPUIDefinitions.PAGE_SIZE, "swId"), swQF);
-                new LazyQueryDefinition(true, SPUIDefinitions.PAGE_SIZE, "swId"), swQF);
-        return container;
     }
-    
+
     private Map<String, Object> prepareQueryConfigFilters() {
-        final Map<String, Object> queryConfig = new HashMap<String, Object>();
+        final Map<String, Object> queryConfig = new HashMap<>();
         manageDistUIState.getSoftwareModuleFilters().getSearchText()
                 .ifPresent(value -> queryConfig.put(SPUIDefinitions.FILTER_BY_TEXT, value));
 
         manageDistUIState.getSoftwareModuleFilters().getSoftwareModuleType()
                 .ifPresent(type -> queryConfig.put(SPUIDefinitions.BY_SOFTWARE_MODULE_TYPE, type));
 
-        manageDistUIState.getLastSelectedDistribution().ifPresent(
+        manageDistUIState.getLastSelectedDistribution()
-                distIdName -> queryConfig.put(SPUIDefinitions.ORDER_BY_DISTRIBUTION, distIdName.getId()));
+                .ifPresent(distIdName -> queryConfig.put(SPUIDefinitions.ORDER_BY_DISTRIBUTION, distIdName.getId()));
 
         return queryConfig;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.SPTable#addContainerProperties(com.
-     * vaadin.data.Container)
-     */
     @Override
     protected void addContainerProperties(final Container container) {
         final LazyQueryContainer lazyContainer = (LazyQueryContainer) container;
@@ -226,11 +204,6 @@ public class SwModuleTable extends AbstractTable {
         lazyContainer.addContainerProperty(SPUILabelDefinitions.VAR_SOFT_TYPE_ID, Long.class, null, false, true);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.SPTable#addCustomGeneratedColumns()
-     */
     @Override
     protected void addCustomGeneratedColumns() {
 
@@ -249,32 +222,16 @@ public class SwModuleTable extends AbstractTable {
         });
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.SPTable#isFirstRowSelectedOnLoad()
-     */
     @Override
     protected boolean isFirstRowSelectedOnLoad() {
         return manageDistUIState.getSelectedSoftwareModules().isEmpty();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.SPTable#getItemIdToSelect()
-     */
     @Override
     protected Object getItemIdToSelect() {
         return manageDistUIState.getSelectedSoftwareModules();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.SPTable#isMaximized()
-     */
     @Override
     protected boolean isMaximized() {
         return manageDistUIState.isSwModuleTableMaximized();
@@ -306,16 +263,9 @@ public class SwModuleTable extends AbstractTable {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.SPTable#getTableVisibleColumns
-     * ()
-     */
     @Override
     protected List<TableColumn> getTableVisibleColumns() {
-        final List<TableColumn> columnList = new ArrayList<TableColumn>();
+        final List<TableColumn> columnList = new ArrayList<>();
         if (isMaximized()) {
             columnList.add(new TableColumn(SPUILabelDefinitions.VAR_NAME, i18n.get("header.name"), 0.2F));
             columnList.add(new TableColumn(SPUILabelDefinitions.VAR_VERSION, i18n.get("header.version"), 0.1F));
@@ -370,11 +320,6 @@ public class SwModuleTable extends AbstractTable {
 
     }
 
-    /**
-     * @param color
-     * @param isAssigned
-     * @return
-     */
     private String getTableStyle(final Long typeId, final boolean isAssigned, final String color) {
         if (isAssigned) {
             addTypeStyle(typeId, color);
@@ -391,11 +336,6 @@ public class SwModuleTable extends AbstractTable {
                                 + "{background-color:" + color + " !important;background-image:none !important }")));
     }
 
-    /**
-     * @param itemId
-     * @param propertyId
-     * @return
-     */
     private String createTableStyle(final Object itemId, final Object propertyId) {
         if (null == propertyId) {
             final Item item = getItem(itemId);
@@ -429,12 +369,6 @@ public class SwModuleTable extends AbstractTable {
         return name + "." + version;
     }
 
-    /**
-     * Add new software module to table.
-     *
-     * @param swModule
-     *            new software module
-     */
     @SuppressWarnings("unchecked")
     private void addSoftwareModule(final SoftwareModule swModule) {
         final Object addItem = addItem();
@@ -461,11 +395,6 @@ public class SwModuleTable extends AbstractTable {
         select(swModule.getId());
     }
 
-    /**
-     * @param itemId
-     * @param nameVersionStr
-     * @return
-     */
     private void showArtifactDetailsWindow(final Long itemId, final String nameVersionStr) {
         final Window atrifactDtlsWindow = new Window();
         atrifactDtlsWindow.setCaption(HawkbitCommonUtil.getArtifactoryDetailsLabelId(nameVersionStr));

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java

@@ -36,9 +36,6 @@ import com.vaadin.ui.Window;
 /**
  * Implementation of software module Header block using generic abstract details
  * style .
- * 
- *
- *
  */
 @SpringComponent
 @ViewScope
@@ -61,9 +58,7 @@ public class SwModuleTableHeader extends AbstractTableHeader {
     @Autowired
     private SoftwareModuleAddUpdateWindow softwareModuleAddUpdateWindow;
 
-    /**
+    @Override
-     * Initialize the components.
-     */
     @PostConstruct
     protected void init() {
         super.init();
@@ -82,45 +77,21 @@ public class SwModuleTableHeader extends AbstractTableHeader {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getHeaderCaption
-     * ()
-     */
     @Override
     protected String getHeaderCaption() {
         return i18n.get("upload.swModuleTable.header");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getSearchBoxId()
-     */
     @Override
     protected String getSearchBoxId() {
         return SPUIComponetIdProvider.SW_MODULE_SEARCH_TEXT_FIELD;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.SPTableHeader#getSearchRestIconId()
-     */
     @Override
     protected String getSearchRestIconId() {
         return SPUIComponetIdProvider.SW_MODULE_SEARCH_RESET_ICON;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getAddIconId()
-     */
     @Override
     protected String getAddIconId() {
         return SPUIComponetIdProvider.SW_MODULE_ADD_BUTTON;
@@ -134,99 +105,47 @@ public class SwModuleTableHeader extends AbstractTableHeader {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getDropFilterId(
-     * )
-     */
     @Override
     protected String getDropFilterId() {
         /* not required */
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * isDropHintRequired()
-     */
     @Override
     protected boolean isDropHintRequired() {
-        /* not required */
         return false;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.SPTableHeader#isDropFilterRequired()
-     */
     @Override
     protected boolean isDropFilterRequired() {
         /* Not Yet Implemented */
         return false;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#
-     * getShowFilterButtonLayoutId()
-     */
     @Override
     protected String getShowFilterButtonLayoutId() {
         return "show.type.icon";
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.SPTableHeader#showFilterButtonsLayout
-     * ()
-     */
     @Override
     protected void showFilterButtonsLayout() {
         manageDistUIState.setSwTypeFilterClosed(false);
         eventbus.publish(this, DistributionsUIEvent.SHOW_SM_FILTER_BY_TYPE);
-
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#resetSearchText(
-     * )
-     */
     @Override
     protected void resetSearchText() {
-        if(manageDistUIState.getSoftwareModuleFilters().getSearchText().isPresent()){
+        if (manageDistUIState.getSoftwareModuleFilters().getSearchText().isPresent()) {
             manageDistUIState.getSoftwareModuleFilters().setSearchText(null);
             eventbus.publish(this, SMFilterEvent.REMOVER_FILTER_BY_TEXT);
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getMaxMinIconId(
-     * )
-     */
     @Override
     protected String getMaxMinIconId() {
         return SPUIComponetIdProvider.SW_MAX_MIN_TABLE_ICON;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#maximizeTable()
-     */
     @Override
     public void maximizeTable() {
         manageDistUIState.setSwModuleTableMaximized(Boolean.TRUE);
@@ -234,58 +153,28 @@ public class SwModuleTableHeader extends AbstractTableHeader {
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#minimizeTable()
-     */
     @Override
     public void minimizeTable() {
         manageDistUIState.setSwModuleTableMaximized(Boolean.FALSE);
         eventbus.publish(this, new SoftwareModuleEvent(SoftwareModuleEventType.MINIMIZED, null));
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.SPTableHeader#onLoadIsTableMaximized(
-     * )
-     */
     @Override
     public Boolean onLoadIsTableMaximized() {
         return manageDistUIState.isSwModuleTableMaximized();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#
-     * onLoadIsShowFilterButtonDisplayed()
-     */
     @Override
     public Boolean onLoadIsShowFilterButtonDisplayed() {
         return manageDistUIState.isSwTypeFilterClosed();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.SPTableHeader#searchBy(java.lang.
-     * String)
-     */
     @Override
     protected void searchBy(final String newSearchText) {
         manageDistUIState.getSoftwareModuleFilters().setSearchText(newSearchText);
         eventbus.publish(this, SMFilterEvent.FILTER_BY_TEXT);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.SPTableHeader#addNewItem(com.vaadin.
-     * ui.Button.ClickEvent)
-     */
     @Override
     protected void addNewItem(final ClickEvent event) {
         final Window addSoftwareModule = softwareModuleAddUpdateWindow.createAddSoftwareModuleWindow();
@@ -294,22 +183,11 @@ public class SwModuleTableHeader extends AbstractTableHeader {
         addSoftwareModule.setVisible(Boolean.TRUE);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.SPTableHeader#hasCreatePermission()
-     */
     @Override
     protected boolean hasCreatePermission() {
         return permChecker.hasCreateDistributionPermission();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * isAddNewItemAllowed()
-     */
     @Override
     protected Boolean isAddNewItemAllowed() {
         return true;
@@ -330,47 +208,21 @@ public class SwModuleTableHeader extends AbstractTableHeader {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * getBulkUploadIconId()
-     */
     @Override
     protected String getBulkUploadIconId() {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#bulkUpload(com.
-     * vaadin.ui.Button.ClickEvent )
-     */
     @Override
     protected void bulkUpload(final ClickEvent event) {
-        /**
+        // No implementation as no bulk upload is supported.
-         * No implementation as no bulk upload is supported.
-         */
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * isBulkUploadAllowed()
-     */
     @Override
     protected Boolean isBulkUploadAllowed() {
         return Boolean.FALSE;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.ui.common.table.AbstractTableHeader#
-     * isBulkUploadInProgress()
-     */
     @Override
     protected boolean isBulkUploadInProgress() {
         return false;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtons.java

@@ -40,8 +40,6 @@ import com.vaadin.spring.annotation.ViewScope;
 /**
  * Software Module Type filter buttons.
  * 
- *
- * 
  */
 @SpringComponent
 @ViewScope
@@ -58,46 +56,24 @@ public class DistSMTypeFilterButtons extends AbstractFilterButtons {
     @Autowired
     private DistributionsViewAcceptCriteria distributionsViewAcceptCriteria;
 
-    /**
+    @Override
-     * Initialize component.
-     * 
-     * @param filterButtonClickBehaviour
-     *            the clickable behaviour.
-     */
     public void init(final AbstractFilterButtonClickBehaviour filterButtonClickBehaviour) {
         super.init(filterButtonClickBehaviour);
         eventBus.subscribe(this);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * getButtonsTableId()
-     */
     @Override
     protected String getButtonsTableId() {
-
         return SPUIComponetIdProvider.SW_MODULE_TYPE_TABLE_ID;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * createButtonsLazyQueryContainer ()
-     */
     @Override
     protected LazyQueryContainer createButtonsLazyQueryContainer() {
-        final Map<String, Object> queryConfig = new HashMap<String, Object>();
+        final Map<String, Object> queryConfig = new HashMap<>();
-        final BeanQueryFactory<SoftwareModuleTypeBeanQuery> typeQF = new BeanQueryFactory<SoftwareModuleTypeBeanQuery>(
+        final BeanQueryFactory<SoftwareModuleTypeBeanQuery> typeQF = new BeanQueryFactory<>(
                 SoftwareModuleTypeBeanQuery.class);
         typeQF.setQueryConfiguration(queryConfig);
-        final LazyQueryContainer lazyQueryContainer = new LazyQueryContainer(
+        return new LazyQueryContainer(new LazyQueryDefinition(true, 20, SPUILabelDefinitions.VAR_NAME), typeQF);
-                new LazyQueryDefinition(true, 20, SPUILabelDefinitions.VAR_NAME), typeQF);
-        return lazyQueryContainer;
     }
 
     @Override
@@ -105,13 +81,6 @@ public class DistSMTypeFilterButtons extends AbstractFilterButtons {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * isClickedByDefault(java.lang .Long)
-     */
     @Override
     protected boolean isClickedByDefault(final Long buttonId) {
 
@@ -119,25 +88,11 @@ public class DistSMTypeFilterButtons extends AbstractFilterButtons {
                 && manageDistUIState.getSoftwareModuleFilters().getSoftwareModuleType().get().getId().equals(buttonId);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * createButtonId(java.lang. String)
-     */
     @Override
     protected String createButtonId(final String name) {
         return SPUIComponetIdProvider.SM_TYPE_FILTER_BTN_ID + name;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * getFilterButtonDropHandler()
-     */
     @Override
     protected DropHandler getFilterButtonDropHandler() {
 
@@ -156,16 +111,8 @@ public class DistSMTypeFilterButtons extends AbstractFilterButtons {
         };
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * getButttonWrapperId()
-     */
     @Override
     protected String getButttonWrapperIdPrefix() {
-
         return SPUIDefinitions.SOFTWARE_MODULE_TAG_ID_PREFIXS;
     }
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterHeader.java

@@ -29,9 +29,6 @@ import com.vaadin.ui.Window;
 
 /**
  * Software Module Type filter buttons header.
- * 
- *
- * 
  */
 @SpringComponent
 @ViewScope
@@ -51,9 +48,7 @@ public class DistSMTypeFilterHeader extends AbstractFilterHeader {
     @Autowired
     private CreateUpdateSoftwareTypeLayout createUpdateSWTypeLayout;
 
-    /**
+    @Override
-     * Initialize the components.
-     */
     @PostConstruct
     public void init() {
         super.init();
@@ -62,50 +57,21 @@ public class DistSMTypeFilterHeader extends AbstractFilterHeader {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * getHideButtonId()
-     */
     @Override
     protected String getHideButtonId() {
         return SPUIComponetIdProvider.SM_SHOW_FILTER_BUTTON_ID;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * hasCreateUpdatePermission()
-     */
     @Override
     protected boolean hasCreateUpdatePermission() {
-
         return permChecker.hasCreateDistributionPermission() || permChecker.hasUpdateDistributionPermission();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#getTitle(
-     * )
-     */
     @Override
     protected String getTitle() {
-
         return SPUILabelDefinitions.TYPE;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * settingsIconClicked(com.vaadin .ui.Button.ClickEvent)
-     */
     @Override
     protected void settingsIconClicked(final ClickEvent event) {
         final Window addUpdateWindow = createUpdateSWTypeLayout.getWindow();
@@ -114,51 +80,22 @@ public class DistSMTypeFilterHeader extends AbstractFilterHeader {
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * dropHitsRequired()
-     */
     @Override
     protected boolean dropHitsRequired() {
-
         return false;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * hideFilterButtonLayout()
-     */
     @Override
     protected void hideFilterButtonLayout() {
         manageDistUIState.setSwTypeFilterClosed(true);
         eventBus.publish(this, DistributionsUIEvent.HIDE_SM_FILTER_BY_TYPE);
-
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * getConfigureFilterButtonId()
-     */
     @Override
     protected String getConfigureFilterButtonId() {
         return SPUIDefinitions.ADD_SOFTWARE_MODULE_TYPE;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterHeader#
-     * isAddTagRequired()
-     */
     @Override
     protected boolean isAddTagRequired() {
         return true;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/state/ManageDistFilters.java

@@ -20,8 +20,6 @@ import com.vaadin.spring.annotation.VaadinSessionScope;
 
 /**
  * Distribution table filter state.
- *
- *
  */
 @SpringComponent
 @VaadinSessionScope
@@ -31,9 +29,9 @@ public class ManageDistFilters implements Serializable {
 
     private String searchText;
 
-    private List<String> distSetTags = new ArrayList<String>();
+    private List<String> distSetTags = new ArrayList<>();
 
-    private List<String> clickedDistSetTags = new ArrayList<String>();
+    private List<String> clickedDistSetTags = new ArrayList<>();
 
     private DistributionSetType clickedDistSetType;
 
@@ -61,17 +59,10 @@ public class ManageDistFilters implements Serializable {
         this.clickedDistSetTags = clickedDistSetTags;
     }
 
-    /**
-     * @return the searchText
-     */
     public Optional<String> getSearchText() {
         return searchText == null ? Optional.empty() : Optional.of(searchText);
     }
 
-    /**
-     * @param searchText
-     *            the searchText to set
-     */
     public void setSearchText(final String searchText) {
         this.searchText = searchText;
     }

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterBeanQuery.java

@@ -34,7 +34,6 @@ import com.google.common.base.Strings;
  *
  *
  */
-
 public class TargetFilterBeanQuery extends AbstractBeanQuery<ProxyTargetFilter> {
 
     private static final long serialVersionUID = 1845964596238990987L;
@@ -76,8 +75,8 @@ public class TargetFilterBeanQuery extends AbstractBeanQuery<ProxyTargetFilter>
 
     @Override
     protected List<ProxyTargetFilter> loadBeans(final int startIndex, final int count) {
-        Slice<TargetFilterQuery> targetFilterQuery = null;
+        Slice<TargetFilterQuery> targetFilterQuery;
-        final List<ProxyTargetFilter> proxyTargetFilter = new ArrayList<ProxyTargetFilter>();
+        final List<ProxyTargetFilter> proxyTargetFilter = new ArrayList<>();
         if (startIndex == 0 && firstPageTargetFilter != null) {
             targetFilterQuery = firstPageTargetFilter;
         } else if (Strings.isNullOrEmpty(searchText)) {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTable.java

@@ -41,7 +41,6 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod;
 import com.vaadin.data.Container;
 import com.vaadin.data.Item;
 import com.vaadin.server.FontAwesome;
-import com.vaadin.server.Sizeable.Unit;
 import com.vaadin.spring.annotation.SpringComponent;
 import com.vaadin.spring.annotation.ViewScope;
 import com.vaadin.ui.Button;
@@ -84,20 +83,20 @@ public class TargetFilterTable extends Table {
      * Initialize the Action History Table.
      */
     @PostConstruct
-	public void init() {
+    public void init() {
-		setStyleName("sp-table");
+        setStyleName("sp-table");
-		setSizeFull();
+        setSizeFull();
-		setImmediate(true);
+        setImmediate(true);
-		setHeight(100.0f, Unit.PERCENTAGE);
+        setHeight(100.0f, Unit.PERCENTAGE);
-		addStyleName(ValoTheme.TABLE_NO_VERTICAL_LINES);
+        addStyleName(ValoTheme.TABLE_NO_VERTICAL_LINES);
-		addStyleName(ValoTheme.TABLE_SMALL);
+        addStyleName(ValoTheme.TABLE_SMALL);
-		addCustomGeneratedColumns();
+        addCustomGeneratedColumns();
-		populateTableData();
+        populateTableData();
-		setColumnCollapsingAllowed(true);
+        setColumnCollapsingAllowed(true);
-		setColumnProperties();
+        setColumnProperties();
-		setId(SPUIComponetIdProvider.TAEGET_FILTER_TABLE_ID);
+        setId(SPUIComponetIdProvider.TAEGET_FILTER_TABLE_ID);
-		eventBus.subscribe(this);
+        eventBus.subscribe(this);
-	}
+    }
 
     @PreDestroy
     void destroy() {
@@ -114,20 +113,14 @@ public class TargetFilterTable extends Table {
         }
     }
 
-    /**
-     * Create a empty HierarchicalContainer.
-     * 
-     * 
-     */
     private Container createContainer() {
         final Map<String, Object> queryConfig = prepareQueryConfigFilters();
-        final BeanQueryFactory<TargetFilterBeanQuery> targetQF = new BeanQueryFactory<TargetFilterBeanQuery>(
+        final BeanQueryFactory<TargetFilterBeanQuery> targetQF = new BeanQueryFactory<>(TargetFilterBeanQuery.class);
-                TargetFilterBeanQuery.class);
 
         targetQF.setQueryConfiguration(queryConfig);
         // create lazy query container with lazy defination and query
-        final LazyQueryContainer targetFilterContainer = new LazyQueryContainer(new LazyQueryDefinition(true,
+        final LazyQueryContainer targetFilterContainer = new LazyQueryContainer(
-                SPUIDefinitions.PAGE_SIZE, SPUILabelDefinitions.VAR_ID), targetQF);
+                new LazyQueryDefinition(true, SPUIDefinitions.PAGE_SIZE, SPUILabelDefinitions.VAR_ID), targetQF);
         targetFilterContainer.getQueryView().getQueryDefinition().setMaxNestedPropertyDepth(PROPERTY_DEPT);
 
         return targetFilterContainer;
@@ -135,15 +128,12 @@ public class TargetFilterTable extends Table {
     }
 
     private Map<String, Object> prepareQueryConfigFilters() {
-        final Map<String, Object> queryConfig = new HashMap<String, Object>();
+        final Map<String, Object> queryConfig = new HashMap<>();
-        filterManagementUIState.getCustomFilterSearchText().ifPresent(
+        filterManagementUIState.getCustomFilterSearchText()
-                value -> queryConfig.put(SPUIDefinitions.FILTER_BY_TEXT, value));
+                .ifPresent(value -> queryConfig.put(SPUIDefinitions.FILTER_BY_TEXT, value));
         return queryConfig;
     }
 
-    /**
-     * Create a empty HierarchicalContainer.
-     */
     private void addContainerproperties() {
         /* Create HierarchicalContainer container */
         container.addContainerProperty(SPUILabelDefinitions.NAME, Link.class, null);
@@ -154,7 +144,7 @@ public class TargetFilterTable extends Table {
     }
 
     private List<TableColumn> getVisbleColumns() {
-        final List<TableColumn> columnList = new ArrayList<TableColumn>();
+        final List<TableColumn> columnList = new ArrayList<>();
         columnList.add(new TableColumn(SPUILabelDefinitions.NAME, i18n.get("header.name"), 0.2F));
         columnList.add(new TableColumn(SPUILabelDefinitions.VAR_CREATED_USER, i18n.get("header.createdBy"), 0.15F));
         columnList.add(new TableColumn(SPUILabelDefinitions.VAR_CREATED_DATE, i18n.get("header.createdDate"), 0.2F));
@@ -165,7 +155,6 @@ public class TargetFilterTable extends Table {
 
     }
 
-    /* re -create the container and get the data and set it to the table */
     private void refreshContainer() {
         populateTableData();
 
@@ -187,10 +176,6 @@ public class TargetFilterTable extends Table {
                 .toString();
     }
 
-    /**
-     * @param event
-     * @return
-     */
     private void onDelete(final ClickEvent event) {
         /* Display the confirmation */
         final ConfirmationDialog confirmDialog = new ConfirmationDialog(i18n.get("caption.filter.delete.confirmbox"),
@@ -206,8 +191,8 @@ public class TargetFilterTable extends Table {
                          * of the deleted custom filter.
                          */
 
-                        notification.displaySuccess(i18n.get("message.delete.filter.success",
+                        notification.displaySuccess(
-                                new Object[] { deletedFilterName }));
+                                i18n.get("message.delete.filter.success", new Object[] { deletedFilterName }));
                         refreshContainer();
                     }
                 });
@@ -236,10 +221,6 @@ public class TargetFilterTable extends Table {
         return updateIcon;
     }
 
-    /**
-     * @param event
-     * @return
-     */
     private void onClickOfDetailButton(final ClickEvent event) {
         final String targetFilterName = (String) ((Button) event.getComponent()).getData();
         final TargetFilterQuery targetFilterQuery = targetFilterQueryManagement

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java

@@ -202,16 +202,8 @@ public class ActionHistoryTable extends TreeTable implements Handler {
         hierarchicalContainer.addContainerProperty(SPUIDefinitions.ACTION_HIS_TBL_ROLLOUT_NAME, String.class, null);
     }
 
-    /**
-     * Get Action based on status.
-     *
-     * @param type
-     *            as Action.Type
-     *
-     * @return List of Actions
-     */
     private List<Object> getVisbleColumns() {
-        final List<Object> visibleColumnIds = new ArrayList<Object>();
+        final List<Object> visibleColumnIds = new ArrayList<>();
         visibleColumnIds.add(SPUIDefinitions.ACTION_HIS_TBL_ACTIVE);
         visibleColumnIds.add(SPUIDefinitions.ACTION_HIS_TBL_DIST);
         visibleColumnIds.add(SPUIDefinitions.ACTION_HIS_TBL_DATETIME);

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionBeanQuery.java

@@ -96,7 +96,7 @@ public class DistributionBeanQuery extends AbstractBeanQuery<ProxyDistribution>
     @Override
     protected List<ProxyDistribution> loadBeans(final int startIndex, final int count) {
         Page<DistributionSet> distBeans;
-        final List<ProxyDistribution> proxyDistributions = new ArrayList<ProxyDistribution>();
+        final List<ProxyDistribution> proxyDistributions = new ArrayList<>();
         if (startIndex == 0 && firstPageDistributionSets != null) {
             distBeans = firstPageDistributionSets;
         } else if (pinnedControllerId != null) {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java

@@ -39,9 +39,6 @@ import com.vaadin.ui.Window;
 
 /**
  * Distribution set details layout.
- *
- *
- *
  */
 @SpringComponent
 @ViewScope
@@ -75,9 +72,7 @@ public class DistributionDetails extends AbstractTableDetailsLayout {
 
     private UI ui;
 
-    /**
+    @Override
-     * softwareLayout Initialize the component.
-     */
     @PostConstruct
     protected void init() {
         eventBus.subscribe(this);
@@ -116,23 +111,11 @@ public class DistributionDetails extends AbstractTableDetailsLayout {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
-     * getDefaultCaption()
-     */
     @Override
     protected String getDefaultCaption() {
         return i18n.get("distribution.details.header");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
-     * addTabs(com.vaadin. ui.TabSheet)
-     */
     @Override
     protected void addTabs(final TabSheet detailsTab) {
         detailsTab.addTab(createDetailsLayout(), i18n.get("caption.tab.details"), null);
@@ -142,12 +125,6 @@ public class DistributionDetails extends AbstractTableDetailsLayout {
         detailsTab.addTab(createLogLayout(), i18n.get("caption.logs.tab"), null);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
-     * onEdit(com.vaadin.ui .Button.ClickEvent)
-     */
     @Override
     protected void onEdit(final ClickEvent event) {
         final Window newDistWindow = distributionAddUpdateWindowLayout.getWindow();
@@ -157,79 +134,37 @@ public class DistributionDetails extends AbstractTableDetailsLayout {
         newDistWindow.setVisible(Boolean.TRUE);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
-     * getEditButtonId()
-     */
     @Override
     protected String getEditButtonId() {
         return SPUIComponetIdProvider.DS_EDIT_BUTTON;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
-     * onLoadIsTableRowSelected ()
-     */
     @Override
     protected Boolean onLoadIsTableRowSelected() {
         return !(managementUIState.getSelectedDsIdName().isPresent()
                 && managementUIState.getSelectedDsIdName().get().isEmpty());
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
-     * onLoadIsTableMaximized ()
-     */
     @Override
     protected Boolean onLoadIsTableMaximized() {
         return managementUIState.isDsTableMaximized();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
-     * populateDetailsWidget()
-     */
     @Override
     protected void populateDetailsWidget() {
         populateDetailsWidget(selectedDsModule);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
-     * clearDetails()
-     */
     @Override
     protected void clearDetails() {
         populateDetailsWidget(null);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
-     * hasEditPermission()
-     */
     @Override
     protected Boolean hasEditPermission() {
         return permissionChecker.hasUpdateDistributionPermission();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
-     * getTabSheetId()
-     */
     @Override
     protected String getTabSheetId() {
         return SPUIComponetIdProvider.DISTRIBUTION_DETAILS_TABSHEET;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java

@@ -73,9 +73,6 @@ import com.vaadin.ui.UI;
 
 /**
  * Distribution set table.
- * 
- *
- *
  */
 @SpringComponent
 @ViewScope
@@ -112,11 +109,8 @@ public class DistributionTable extends AbstractTable {
     private Boolean isDistPinned = false;
 
     private Button distributinPinnedBtn;
-    
+
-   
+    @Override
-    /**
-     * Initialize the distribution table.
-     */
     @PostConstruct
     protected void init() {
         super.init();
@@ -142,7 +136,7 @@ public class DistributionTable extends AbstractTable {
                 || event == DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT
                 || event == DistributionTableFilterEvent.FILTER_BY_TAG) {
             UI.getCurrent().access(() -> refreshFilter());
-         }
+        }
     }
 
     @EventBusListenerMethod(scope = EventScope.SESSION)
@@ -221,23 +215,22 @@ public class DistributionTable extends AbstractTable {
     @Override
     protected Container createContainer() {
         final Map<String, Object> queryConfiguration = prepareQueryConfigFilters();
-               
+
-        final BeanQueryFactory<DistributionBeanQuery> distributionQF = new BeanQueryFactory<DistributionBeanQuery>(
+        final BeanQueryFactory<DistributionBeanQuery> distributionQF = new BeanQueryFactory<>(
                 DistributionBeanQuery.class);
         distributionQF.setQueryConfiguration(queryConfiguration);
-        final LazyQueryContainer distributionContainer = new LazyQueryContainer(
+        return new LazyQueryContainer(
                 new LazyQueryDefinition(true, SPUIDefinitions.PAGE_SIZE, SPUILabelDefinitions.VAR_DIST_ID_NAME),
                 distributionQF);
-        return distributionContainer;
     }
-    
+
     private Map<String, Object> prepareQueryConfigFilters() {
-        final Map<String, Object> queryConfig =  new HashMap<String, Object>();
+        final Map<String, Object> queryConfig = new HashMap<>();
-             managementUIState.getDistributionTableFilters().getSearchText()
+        managementUIState.getDistributionTableFilters().getSearchText()
                 .ifPresent(value -> queryConfig.put(SPUIDefinitions.FILTER_BY_TEXT, value));
-             managementUIState.getDistributionTableFilters().getPinnedTargetId()
+        managementUIState.getDistributionTableFilters().getPinnedTargetId()
                 .ifPresent(value -> queryConfig.put(SPUIDefinitions.ORDER_BY_PINNED_TARGET, value));
-       final List<String> list = new ArrayList<String>();
+        final List<String> list = new ArrayList<>();
         queryConfig.put(SPUIDefinitions.FILTER_BY_NO_TAG,
                 managementUIState.getDistributionTableFilters().isNoTagSelected());
         if (!managementUIState.getDistributionTableFilters().getDistSetTags().isEmpty()) {
@@ -247,23 +240,11 @@ public class DistributionTable extends AbstractTable {
         return queryConfig;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTable#addContainerProperties(
-     * com.vaadin.data.Container )
-     */
     @Override
     protected void addContainerProperties(final Container container) {
         HawkbitCommonUtil.getDsTableColumnProperties(container);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTable#
-     * addCustomGeneratedColumns()
-     */
     @Override
     protected void addCustomGeneratedColumns() {
         addGeneratedColumn(SPUILabelDefinitions.PIN_COLUMN, new Table.ColumnGenerator() {
@@ -276,23 +257,12 @@ public class DistributionTable extends AbstractTable {
         });
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTable#
-     * isFirstRowSelectedOnLoad()
-     */
     @Override
     protected boolean isFirstRowSelectedOnLoad() {
         return !managementUIState.getSelectedDsIdName().isPresent()
                 || managementUIState.getSelectedDsIdName().get().isEmpty();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTable#getItemIdToSelect()
-     */
     @Override
     protected Object getItemIdToSelect() {
         if (managementUIState.getSelectedDsIdName().isPresent()) {
@@ -301,16 +271,9 @@ public class DistributionTable extends AbstractTable {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.AbstractTable#onValueChange()
-     */
     @Override
     protected void onValueChange() {
         eventBus.publish(this, DragEvent.HIDE_DROP_HINT);
-        @SuppressWarnings("unchecked")
         final Set<DistributionSetIdName> values = HawkbitCommonUtil.getSelectedDSDetails(this);
         DistributionSetIdName value = null;
         if (values != null && !values.isEmpty()) {
@@ -319,10 +282,7 @@ public class DistributionTable extends AbstractTable {
             while (iterator.hasNext()) {
                 value = iterator.next();
             }
-            /**
+
-             * Adding null check to make to avoid NPE.Its weird that at times
-             * getValue returns null.
-             */
             if (null != value) {
                 managementUIState.setSelectedDsIdName(values);
                 managementUIState.setLastSelectedDsIdName(value);
@@ -339,33 +299,16 @@ public class DistributionTable extends AbstractTable {
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.table.AbstractTable#isMaximized()
-     */
     @Override
     protected boolean isMaximized() {
         return managementUIState.isDsTableMaximized();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTable#getTableVisibleColumns(
-     * )
-     */
     @Override
     protected List<TableColumn> getTableVisibleColumns() {
         return HawkbitCommonUtil.getTableVisibleColumns(isMaximized(), true, i18n);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTable#getTableDropHandler()
-     */
     @Override
     protected DropHandler getTableDropHandler() {
         return new DropHandler() {
@@ -403,7 +346,7 @@ public class DistributionTable extends AbstractTable {
         final com.vaadin.event.dd.TargetDetails taregtDet = event.getTargetDetails();
         final Table distTable = (Table) taregtDet.getTarget();
         final Set<DistributionSetIdName> distsSelected = HawkbitCommonUtil.getSelectedDSDetails(distTable);
-        final Set<Long> distList = new HashSet<Long>();
+        final Set<Long> distList = new HashSet<>();
 
         final AbstractSelectTargetDetails dropData = (AbstractSelectTargetDetails) event.getTargetDetails();
         final Object distItemId = dropData.getItemIdOver();
@@ -435,7 +378,7 @@ public class DistributionTable extends AbstractTable {
         // assign dist to those targets
         final List<Target> assignedTargets = targetService.findTargetsByTag(targetTagName);
         if (!assignedTargets.isEmpty()) {
-            final Set<TargetIdName> targetDetailsList = new HashSet<TargetIdName>();
+            final Set<TargetIdName> targetDetailsList = new HashSet<>();
             assignedTargets.forEach(target -> targetDetailsList
                     .add(new TargetIdName(target.getId(), target.getControllerId(), target.getName())));
             assignTargetToDs(getItem(distItemId), targetDetailsList);
@@ -448,7 +391,7 @@ public class DistributionTable extends AbstractTable {
         final TableTransferable transferable = (TableTransferable) event.getTransferable();
         final Table source = transferable.getSourceComponent();
         final Set<TargetIdName> targetsSelected = HawkbitCommonUtil.getSelectedTargetDetails(source);
-        final Set<TargetIdName> targetDetailsList = new HashSet<TargetIdName>();
+        final Set<TargetIdName> targetDetailsList = new HashSet<>();
 
         if (!targetsSelected.contains(transferable.getData("itemId"))) {
             targetDetailsList.add((TargetIdName) transferable.getData("itemId"));
@@ -474,13 +417,6 @@ public class DistributionTable extends AbstractTable {
         }
     }
 
-    /**
-     * Validate event.
-     *
-     * @param dragEvent
-     *            as event
-     * @return boolean as flag
-     */
     private Boolean doValidation(final DragAndDropEvent dragEvent) {
         final Component compsource = dragEvent.getTransferable().getSourceComponent();
         if (compsource instanceof Table) {
@@ -528,15 +464,6 @@ public class DistributionTable extends AbstractTable {
         return false;
     }
 
-    /**
-     * Validate the assignment.
-     *
-     * @param targetDetailsList
-     * @param source
-     * @param distId
-     * @param distName
-     * @return String as indicator
-     */
     private String validate(final Set<TargetIdName> targetDetailsList,
             final DistributionSetIdName distributionSetIdName) {
         String pendingActionMessage = null;
@@ -555,17 +482,6 @@ public class DistributionTable extends AbstractTable {
         return pendingActionMessage;
     }
 
-    /**
-     * Message for Pending Action.
-     *
-     * @param message
-     *            as msg
-     * @param targId
-     *            as ID
-     * @param distName
-     *            as Dist Set Name
-     * @return String as message
-     */
     private String getPendingActionMessage(final String message, final String targId, final String distNameVersion) {
         String pendActionMsg = i18n.get("message.target.assigned.pending");
         if (null == message) {
@@ -574,12 +490,6 @@ public class DistributionTable extends AbstractTable {
         return pendActionMsg;
     }
 
-    /**
-     * Show or Hide Popup Notification Message.
-     *
-     * @param message
-     *            as msg
-     */
     private void showOrHidePopupAndNotification(final String message) {
         if (null != managementUIState.getAssignedList() && !managementUIState.getAssignedList().isEmpty()) {
             eventBus.publish(this, ManagementUIEvent.UPDATE_COUNT);
@@ -636,19 +546,6 @@ public class DistributionTable extends AbstractTable {
         }
     }
 
-    /**
-     * Added by Saumya Get Pin style.
-     * 
-     * @param itemId
-     *            as item clicked
-     * @param propertyId
-     *            as property
-     * @param installedDistItemIds
-     *            as set
-     * @param assignedDistTableItemIds
-     *            as set
-     * @return String as Style
-     */
     private String getPinnedDistributionStyle(final Long installedDistItemIds, final Long assignedDistTableItemIds,
             final Object itemId) {
         final Long distId = ((DistributionSetIdName) itemId).getId();
@@ -662,10 +559,6 @@ public class DistributionTable extends AbstractTable {
         }
     }
 
-    /**
-     * @param itemId
-     * @return
-     */
     private Object getPinButton(final Object itemId) {
         final DistributionSetIdName dist = (DistributionSetIdName) getContainerDataSource().getItem(itemId)
                 .getItemProperty(SPUILabelDefinitions.VAR_DIST_ID_NAME).getValue();
@@ -684,12 +577,6 @@ public class DistributionTable extends AbstractTable {
         }
     }
 
-    /**
-     * Add listener to pin.
-     *
-     * @param pinBtn
-     *            as event
-     */
     private void addPinClickListener(final ClickEvent event) {
         eventBus.publish(this, DragEvent.HIDE_DROP_HINT);
         checkifAlreadyPinned(event.getButton());
@@ -701,12 +588,6 @@ public class DistributionTable extends AbstractTable {
 
     }
 
-    /**
-     * Check already pinned.
-     *
-     * @param eventBtn
-     *            as button
-     */
     private void checkifAlreadyPinned(final Button eventBtn) {
         final Long newPinnedDistItemId = ((DistributionSetIdName) eventBtn.getData()).getId();
         Long pinnedDistId = null;
@@ -758,9 +639,6 @@ public class DistributionTable extends AbstractTable {
         }
     }
 
-    /**
-     * set style to distribution set table.
-     */
     private void styleDistributionSetTable() {
         setCellStyleGenerator(new Table.CellStyleGenerator() {
             private static final long serialVersionUID = 1L;
@@ -772,12 +650,6 @@ public class DistributionTable extends AbstractTable {
         });
     }
 
-    /**
-     * Apply pin style to pin.
-     * 
-     * @param eventBtn
-     *            as button
-     */
     private void applyPinStyle(final Button eventBtn) {
         final StringBuilder style = new StringBuilder(SPUIComponentProvider.getPinButtonStyle());
         style.append(' ').append(SPUIStyleDefinitions.DIST_PIN).append(' ').append("tablePin").append(' ')
@@ -822,14 +694,9 @@ public class DistributionTable extends AbstractTable {
      * @param assignedDistTableItemIds
      *            Item ids of assigned distribution set
      */
-    @SuppressWarnings("serial")
     public void styleDistributionSetTable(final Long installedDistItemId, final Long assignedDistTableItemId) {
-        setCellStyleGenerator(new Table.CellStyleGenerator() {
+        setCellStyleGenerator((source, itemId, propertyId) -> getPinnedDistributionStyle(installedDistItemId,
-            @Override
+                assignedDistTableItemId, itemId));
-            public String getStyle(final Table source, final Object itemId, final Object propertyId) {
-                return getPinnedDistributionStyle(installedDistItemId, assignedDistTableItemId, itemId);
-            }
-        });
     }
 
     public void setDistributinPinnedBtn(final Button distributinPinnedBtn) {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java

@@ -58,9 +58,7 @@ public class DistributionTableHeader extends AbstractTableHeader {
     @Autowired
     private DistributionAddUpdateWindowLayout distributionAddUpdateWindowLayout;
 
-    /**
+    @Override
-     * Initialize the component.
-     */
     @PostConstruct
     protected void init() {
         super.init();
@@ -81,54 +79,26 @@ public class DistributionTableHeader extends AbstractTableHeader {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#getHeaderCaption(
-     * )
-     */
     @Override
     protected String getHeaderCaption() {
         return i18n.get("header.dist.table");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#getSearchBoxId()
-     */
     @Override
     protected String getSearchBoxId() {
         return SPUIComponetIdProvider.DIST_SEARCH_TEXTFIELD;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * getSearchRestIconId()
-     */
     @Override
     protected String getSearchRestIconId() {
         return SPUIComponetIdProvider.DIST_SEARCH_ICON;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#getAddIconId()
-     */
     @Override
     protected String getAddIconId() {
         return SPUIComponetIdProvider.DIST_ADD_ICON;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * onLoadSearchBoxValue()
-     */
     @Override
     protected String onLoadSearchBoxValue() {
         if (managementUIState.getDistributionTableFilters().getSearchText().isPresent()) {
@@ -137,157 +107,78 @@ public class DistributionTableHeader extends AbstractTableHeader {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#getDropFilterId()
-     */
     @Override
     protected String getDropFilterId() {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * hasCreatePermission()
-     */
     @Override
     protected boolean hasCreatePermission() {
         return permChecker.hasCreateDistributionPermission();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * isDropHintRequired()
-     */
     @Override
     protected boolean isDropHintRequired() {
         return true;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * isDropFilterRequired()
-     */
     @Override
     protected boolean isDropFilterRequired() {
         return false;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * getShowFilterButtonLayoutId()
-     */
     @Override
     protected String getShowFilterButtonLayoutId() {
         return "show.dist.tags.icon";
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * showFilterButtonsLayout()
-     */
     @Override
     protected void showFilterButtonsLayout() {
         managementUIState.setDistTagFilterClosed(false);
         eventbus.publish(this, ManagementUIEvent.SHOW_DISTRIBUTION_TAG_LAYOUT);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#resetSearchText()
-     */
     @Override
     protected void resetSearchText() {
-        if( managementUIState.getDistributionTableFilters().getSearchText().isPresent()){
+        if (managementUIState.getDistributionTableFilters().getSearchText().isPresent()) {
             managementUIState.getDistributionTableFilters().setSearchText(null);
             eventbus.publish(this, DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT);
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#getMaxMinIconId()
-     */
     @Override
     protected String getMaxMinIconId() {
         return SPUIComponetIdProvider.DS_MAX_MIN_TABLE_ICON;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#maximizeTable()
-     */
     @Override
     public void maximizeTable() {
         managementUIState.setDsTableMaximized(Boolean.TRUE);
         eventbus.publish(this, new DistributionTableEvent(DistributionComponentEvent.MAXIMIZED, null));
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#minimizeTable()
-     */
     @Override
     public void minimizeTable() {
         managementUIState.setDsTableMaximized(Boolean.FALSE);
         eventbus.publish(this, new DistributionTableEvent(DistributionComponentEvent.MINIMIZED, null));
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * onLoadIsTableMaximized()
-     */
     @Override
     public Boolean onLoadIsTableMaximized() {
         return managementUIState.isDsTableMaximized();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * onLoadIsShowFilterButtonDisplayed()
-     */
     @Override
     public Boolean onLoadIsShowFilterButtonDisplayed() {
         return managementUIState.isDistTagFilterClosed();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#searchBy(java.
-     * lang.String)
-     */
     @Override
     protected void searchBy(final String newSearchText) {
         managementUIState.getDistributionTableFilters().setSearchText(newSearchText);
         eventbus.publish(this, DistributionTableFilterEvent.FILTER_BY_TEXT);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#addNewItem(com.
-     * vaadin.ui.Button.ClickEvent )
-     */
     @Override
     protected void addNewItem(final ClickEvent event) {
         final Window newDistWindow = distributionAddUpdateWindowLayout.getWindow();
@@ -297,12 +188,6 @@ public class DistributionTableHeader extends AbstractTableHeader {
         eventbus.publish(this, DragEvent.HIDE_DROP_HINT);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * isAddNewItemAllowed()
-     */
     @Override
     protected Boolean isAddNewItemAllowed() {
         return Boolean.FALSE;
@@ -323,47 +208,21 @@ public class DistributionTableHeader extends AbstractTableHeader {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * getBulkUploadIconId()
-     */
     @Override
     protected String getBulkUploadIconId() {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.table.AbstractTableHeader#bulkUpload(com.
-     * vaadin.ui.Button.ClickEvent )
-     */
     @Override
     protected void bulkUpload(final ClickEvent event) {
-        /**
+        // No implementation as no bulk upload is supported.
-         * No implementation as no bulk upload is supported.
-         */
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * isBulkUploadAllowed()
-     */
     @Override
     protected Boolean isBulkUploadAllowed() {
         return Boolean.FALSE;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.ui.common.table.AbstractTableHeader#
-     * isBulkUploadInProgress()
-     */
     @Override
     protected boolean isBulkUploadInProgress() {
         return false;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagBeanQuery.java

@@ -75,7 +75,7 @@ public class DistributionTagBeanQuery extends AbstractBeanQuery<ProxyTag> {
     @Override
     protected List<ProxyTag> loadBeans(final int startIndex, final int count) {
         Page<DistributionSetTag> dsTagBeans;
-        final List<ProxyTag> tagList = new ArrayList<ProxyTag>();
+        final List<ProxyTag> tagList = new ArrayList<>();
         if (startIndex == 0 && firstPageDsTag != null) {
             dsTagBeans = firstPageDsTag;
         } else {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java

@@ -64,12 +64,7 @@ public class DistributionTagButtons extends AbstractFilterButtons {
     @Autowired
     private ManagementUIState managementUIState;
 
-    /**
+    @Override
-     * Initialize component.
-     * 
-     * @param filterButtonClickBehaviour
-     *            the clickable behaviour.
-     */
     public void init(final AbstractFilterButtonClickBehaviour filterButtonClickBehaviour) {
         super.init(filterButtonClickBehaviour);
         addNewTag(new DistributionSetTag("NO TAG"));
@@ -98,7 +93,6 @@ public class DistributionTagButtons extends AbstractFilterButtons {
 
     @EventBusListenerMethod(scope = EventScope.SESSION)
     void onEvent(final DragEvent dragEvent) {
-
         if (dragEvent == DragEvent.DISTRIBUTION_DRAG) {
             UI.getCurrent().access(() -> addStyleName(SPUIStyleDefinitions.SHOW_DROP_HINT_FILTER_BUTTON));
         } else {
@@ -106,34 +100,18 @@ public class DistributionTagButtons extends AbstractFilterButtons {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * getButtonsTableId()
-     */
     @Override
     protected String getButtonsTableId() {
         return SPUIComponetIdProvider.DISTRIBUTION_TAG_TABLE_ID;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * createButtonsLazyQueryContainer ()
-     */
     @Override
     protected LazyQueryContainer createButtonsLazyQueryContainer() {
-        final Map<String, Object> queryConfig = new HashMap<String, Object>();
+        final Map<String, Object> queryConfig = new HashMap<>();
-        final BeanQueryFactory<DistributionTagBeanQuery> tagQF = new BeanQueryFactory<DistributionTagBeanQuery>(
+        final BeanQueryFactory<DistributionTagBeanQuery> tagQF = new BeanQueryFactory<>(DistributionTagBeanQuery.class);
-                DistributionTagBeanQuery.class);
         tagQF.setQueryConfiguration(queryConfig);
-        final LazyQueryContainer tagContainer = HawkbitCommonUtil.createDSLazyQueryContainer(
+        return HawkbitCommonUtil.createDSLazyQueryContainer(
                 new BeanQueryFactory<DistributionTagBeanQuery>(DistributionTagBeanQuery.class));
-        return tagContainer;
 
     }
 
@@ -142,13 +120,6 @@ public class DistributionTagButtons extends AbstractFilterButtons {
         return SPUIDefinitions.DISTRIBUTION_TAG_BUTTON;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * isClickedByDefault(java.lang .Long)
-     */
     @Override
     protected boolean isClickedByDefault(final Long buttonId) {
         final DistributionSetTag dsTagObject = tagMgmtService.findDistributionSetTagById(buttonId);
@@ -161,37 +132,16 @@ public class DistributionTagButtons extends AbstractFilterButtons {
         return managementUIState.getDistributionTableFilters().isNoTagSelected();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * createButtonId(java.lang. String)
-     */
     @Override
     protected String createButtonId(final String name) {
         return name;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * getFilterButtonDropHandler()
-     */
     @Override
     protected DropHandler getFilterButtonDropHandler() {
         return spDistTagDropEvent;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * getButttonWrapperId()
-     */
     @Override
     protected String getButttonWrapperIdPrefix() {
         return SPUIDefinitions.DISTRIBUTION_TAG_ID_PREFIXS;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagHeader.java

@@ -50,9 +50,7 @@ public class DistributionTagHeader extends AbstractFilterHeader {
     @Autowired
     private CreateUpdateDistributionTagLayoutWindow createORUpdateDistributionTagLayout;
 
-    /**
+    @Override
-     * Initialize the components.
-     */
     @PostConstruct
     public void init() {
         super.init();
@@ -61,100 +59,45 @@ public class DistributionTagHeader extends AbstractFilterHeader {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * getHideButtonId()
-     */
     @Override
     protected String getHideButtonId() {
         return "hide.distribution.tags";
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * hasCreateUpdatePermission()
-     */
     @Override
     protected boolean hasCreateUpdatePermission() {
         return permChecker.hasCreateDistributionPermission() || permChecker.hasUpdateDistributionPermission();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#getTitle(
-     * )
-     */
     @Override
     protected String getTitle() {
         return i18n.get("header.filter.tag", new Object[] {});
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * settingsIconClicked(com.vaadin .ui.Button.ClickEvent)
-     */
     @Override
     protected void settingsIconClicked(final ClickEvent event) {
         final Window addUpdateWindow = createORUpdateDistributionTagLayout.getWindow();
         UI.getCurrent().addWindow(addUpdateWindow);
         addUpdateWindow.setModal(true);
         addUpdateWindow.setVisible(Boolean.TRUE);
-
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * dropHitsRequired()
-     */
     @Override
     protected boolean dropHitsRequired() {
         return true;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * hideFilterButtonLayout()
-     */
     @Override
     protected void hideFilterButtonLayout() {
         managementUIState.setDistTagFilterClosed(true);
         eventbus.publish(this, ManagementUIEvent.HIDE_DISTRIBUTION_TAG_LAYOUT);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * getConfigureFilterButtonId()
-     */
     @Override
     protected String getConfigureFilterButtonId() {
         return SPUIComponetIdProvider.ADD_DISTRIBUTION_TAG;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterHeader#
-     * isAddTagRequired()
-     */
     @Override
     protected boolean isAddTagRequired() {
         return true;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/DistributionTagDropEvent.java

@@ -86,20 +86,13 @@ public class DistributionTagDropEvent implements DropHandler {
     private Boolean isNoTagAssigned(final DragAndDropEvent event) {
         final String tagName = ((DragAndDropWrapper) (event.getTargetDetails().getTarget())).getData().toString();
         if (tagName.equals(SPUIDefinitions.DISTRIBUTION_TAG_BUTTON)) {
-            notification.displayValidationError(i18n.get("message.tag.cannot.be.assigned",
+            notification.displayValidationError(
-                    new Object[] { i18n.get("label.no.tag.assigned") }));
+                    i18n.get("message.tag.cannot.be.assigned", new Object[] { i18n.get("label.no.tag.assigned") }));
             return false;
         }
         return true;
     }
 
-    /**
-     * Validate the drop.
-     *
-     * @param event
-     *            DragAndDropEvent reference
-     * @return Boolean
-     */
     private Boolean validate(final DragAndDropEvent event) {
         final Component compsource = event.getTransferable().getSourceComponent();
         if (!(compsource instanceof Table)) {
@@ -116,11 +109,6 @@ public class DistributionTagDropEvent implements DropHandler {
         return true;
     }
 
-    /**
-     * validate the update permission.
-     *
-     * @return boolean
-     */
     private boolean checkForDSUpdatePermission() {
         if (!permChecker.hasUpdateDistributionPermission()) {
 
@@ -131,13 +119,6 @@ public class DistributionTagDropEvent implements DropHandler {
         return true;
     }
 
-    /**
-     * validate the source tables.
-     *
-     * @param source
-     *            table
-     * @return boolean
-     */
     private boolean validateIfSourceIsDs(final Table source) {
         if (!source.getId().equals(SPUIComponetIdProvider.DIST_TABLE_ID)) {
             notification.displayValidationError(i18n.get(SPUILabelDefinitions.ACTION_NOT_ALLOWED));
@@ -146,12 +127,6 @@ public class DistributionTagDropEvent implements DropHandler {
         return true;
     }
 
-    /**
-     * Process target Drop event.
-     *
-     * @param event
-     *            DragAndDropEvent
-     */
     private void processDistributionDrop(final DragAndDropEvent event) {
 
         final com.vaadin.event.dd.TargetDetails targetDetails = event.getTargetDetails();
@@ -161,7 +136,7 @@ public class DistributionTagDropEvent implements DropHandler {
 
         @SuppressWarnings("unchecked")
         final Set<DistributionSetIdName> distSelected = (Set<DistributionSetIdName>) source.getValue();
-        final Set<Long> distributionList = new HashSet<Long>();
+        final Set<Long> distributionList = new HashSet<>();
         if (!distSelected.contains(transferable.getData(ITEMID))) {
             distributionList.add(((DistributionSetIdName) transferable.getData(ITEMID)).getId());
         } else {
@@ -172,8 +147,8 @@ public class DistributionTagDropEvent implements DropHandler {
                 SPUIDefinitions.DISTRIBUTION_TAG_ID_PREFIXS);
 
         final List<String> tagsClickedList = distFilterParameters.getDistSetTags();
-        final DistributionSetTagAssigmentResult result = distributionSetManagement.toggleTagAssignment(
+        final DistributionSetTagAssigmentResult result = distributionSetManagement.toggleTagAssignment(distributionList,
-                distributionList, distTagName);
+                distTagName);
 
         notification.displaySuccess(HawkbitCommonUtil.getDistributionTagAssignmentMsg(distTagName, result, i18n));
         if (result.getUnassigned() >= 1 && !tagsClickedList.isEmpty()) {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/ManagementViewAcceptCriteria.java

@@ -47,12 +47,6 @@ public class ManagementViewAcceptCriteria extends AbstractAcceptCriteria {
     @Autowired
     private transient EventBus.SessionEventBus eventBus;
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.AbstractAcceptCriteria#analyseDragComponent
-     * (com.vaadin.event .dd.DragAndDropEvent, com.vaadin.ui.Component)
-     */
     @Override
     protected void analyseDragComponent(final Component compsource) {
         final String sourceID = getComponentId(compsource);
@@ -60,24 +54,11 @@ public class ManagementViewAcceptCriteria extends AbstractAcceptCriteria {
         eventBus.publish(this, event);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.AbstractAcceptCriteria#hideDropHints
-     * ()
-     */
     @Override
     protected void hideDropHints() {
         eventBus.publish(this, DragEvent.HIDE_DROP_HINT);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.AbstractAcceptCriteria#invalidDrop()
-     */
     @Override
     protected void invalidDrop() {
         uiNotification.displayValidationError(SPUILabelDefinitions.ACTION_NOT_ALLOWED);
@@ -94,60 +75,31 @@ public class ManagementViewAcceptCriteria extends AbstractAcceptCriteria {
         return id;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.AbstractAcceptCriteria#
-     * getDropHintConfigurations()
-     */
     @Override
     protected Map<String, Object> getDropHintConfigurations() {
         return DROP_HINTS_CONFIGS;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.AbstractAcceptCriteria#
-     * publishDragStartEvent(java.lang.Object)
-     */
     @Override
     protected void publishDragStartEvent(final Object event) {
         eventBus.publish(this, event);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.AbstractAcceptCriteria#
-     * getDropConfigurations()
-     */
     @Override
     protected Map<String, List<String>> getDropConfigurations() {
         return DROP_CONFIGS;
     }
 
-    /**
-     * @param id
-     * @return
-     */
     private boolean isDistributionTagId(final String id) {
         return id != null && id.startsWith(SPUIDefinitions.DISTRIBUTION_TAG_ID_PREFIXS);
     }
 
-    /**
-     * @param id
-     * @return
-     */
     private boolean isTargetTagId(final String id) {
         return id != null && id.startsWith(SPUIDefinitions.TARGET_TAG_ID_PREFIXS);
     }
 
-    /**
-     * @return
-     */
     private static Map<String, List<String>> createDropConfigurations() {
-        final Map<String, List<String>> config = new HashMap<String, List<String>>();
+        final Map<String, List<String>> config = new HashMap<>();
 
         // Delete drop area acceptable components
         config.put(SPUIComponetIdProvider.DELETE_BUTTON_WRAPPER_ID,
@@ -174,7 +126,7 @@ public class ManagementViewAcceptCriteria extends AbstractAcceptCriteria {
     }
 
     private static Map<String, Object> createDropHintConfigurations() {
-        final Map<String, Object> config = new HashMap<String, Object>();
+        final Map<String, Object> config = new HashMap<>();
         config.put(SPUIDefinitions.TARGET_TAG_ID_PREFIXS, DragEvent.TARGET_TAG_DRAG);
         config.put(SPUIComponetIdProvider.TARGET_TABLE_ID, DragEvent.TARGET_DRAG);
         config.put(SPUIComponetIdProvider.DIST_TABLE_ID, DragEvent.DISTRIBUTION_DRAG);

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/DeleteActionsLayout.java

@@ -19,7 +19,6 @@ import org.eclipse.hawkbit.repository.TagManagement;
 import org.eclipse.hawkbit.repository.model.DistributionSetIdName;
 import org.eclipse.hawkbit.repository.model.TargetIdName;
 import org.eclipse.hawkbit.ui.common.footer.AbstractDeleteActionsLayout;
-import org.eclipse.hawkbit.ui.management.dstable.DistributionTable;
 import org.eclipse.hawkbit.ui.management.event.BulkUploadPopupEvent;
 import org.eclipse.hawkbit.ui.management.event.DragEvent;
 import org.eclipse.hawkbit.ui.management.event.ManagementUIEvent;
@@ -28,7 +27,6 @@ import org.eclipse.hawkbit.ui.management.event.SaveActionWindowEvent;
 import org.eclipse.hawkbit.ui.management.event.TargetTableEvent;
 import org.eclipse.hawkbit.ui.management.event.TargetTableEvent.TargetComponentEvent;
 import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
-import org.eclipse.hawkbit.ui.management.targettable.TargetTable;
 import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
 import org.eclipse.hawkbit.ui.utils.I18N;
 import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
@@ -85,12 +83,7 @@ public class DeleteActionsLayout extends AbstractDeleteActionsLayout {
     @Autowired
     private CountMessageLabel countMessageLabel;
 
-    /*
+    @Override
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.DeleteActionsLayout#init()
-     */
     @PostConstruct
     protected void init() {
         super.init();
@@ -172,73 +165,31 @@ public class DeleteActionsLayout extends AbstractDeleteActionsLayout {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
-     * hasDeletePermission()
-     */
     @Override
     protected boolean hasDeletePermission() {
         return permChecker.hasDeleteDistributionPermission() || permChecker.hasDeleteTargetPermission();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
-     * hasUpdatePermission()
-     */
     @Override
     protected boolean hasUpdatePermission() {
         return permChecker.hasUpdateTargetPermission() && permChecker.hasReadDistributionPermission();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
-     * getDeleteAreaLabel()
-     */
     @Override
     protected String getDeleteAreaLabel() {
         return i18n.get("label.components.drop.area");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
-     * getDeleteAreaId()
-     */
     @Override
     protected String getDeleteAreaId() {
         return SPUIComponetIdProvider.DELETE_BUTTON_WRAPPER_ID;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
-     * getDeleteLayoutAcceptCriteria ()
-     */
     @Override
     protected AcceptCriterion getDeleteLayoutAcceptCriteria() {
         return managementViewAcceptCriteria;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
-     * processDroppedComponent(com .vaadin.event.dd.DragAndDropEvent)
-     */
     @Override
     protected void processDroppedComponent(final DragAndDropEvent event) {
         final Component source = event.getTransferable().getSourceComponent();
@@ -275,61 +226,26 @@ public class DeleteActionsLayout extends AbstractDeleteActionsLayout {
         return true;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
-     * getNoActionsButtonLabel()
-     */
     @Override
     protected String getNoActionsButtonLabel() {
         return i18n.get("button.no.actions");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
-     * getActionsButtonLabel()
-     */
     @Override
     protected String getActionsButtonLabel() {
         return i18n.get("button.actions");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
-     * reloadActionCount()
-     */
     @Override
     protected void restoreActionCount() {
         updateActionCount();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
-     * getUnsavedActionsWindowCaption ()
-     */
     @Override
     protected String getUnsavedActionsWindowCaption() {
         return i18n.get("caption.save.window");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
-     * unsavedActionsWindowClosed()
-     */
     @Override
     protected void unsavedActionsWindowClosed() {
         final String message = manangementConfirmationWindowLayout.getConsolidatedMessage();
@@ -338,26 +254,12 @@ public class DeleteActionsLayout extends AbstractDeleteActionsLayout {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
-     * getUnsavedActionsWindowContent ()
-     */
     @Override
     protected Component getUnsavedActionsWindowContent() {
         manangementConfirmationWindowLayout.init();
         return manangementConfirmationWindowLayout;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
-     * hasUnsavedActions()
-     */
     @Override
     protected boolean hasUnsavedActions() {
         if (!managementUIState.getDeletedDistributionList().isEmpty()
@@ -368,25 +270,11 @@ public class DeleteActionsLayout extends AbstractDeleteActionsLayout {
         return false;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
-     * hasCountMessage()
-     */
     @Override
     protected boolean hasCountMessage() {
         return permChecker.hasTargetReadPermission();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
-     * getCountMessageLabel()
-     */
     @Override
     protected Label getCountMessageLabel() {
         return countMessageLabel;
@@ -413,19 +301,9 @@ public class DeleteActionsLayout extends AbstractDeleteActionsLayout {
         }
     }
 
-    /**
-     * 
-     * Prepare deleted distribution set .
-     * 
-     * @param sourceTable
-     *            {@link DistributionTable}
-     * @param transferable
-     *            {@link TableTransferable}
-     * 
-     */
     private void addInDeleteDistributionList(final Table sourceTable, final TableTransferable transferable) {
         final Set<DistributionSetIdName> distSelected = HawkbitCommonUtil.getSelectedDSDetails(sourceTable);
-        final Set<DistributionSetIdName> distributionIdNameSet = new HashSet<DistributionSetIdName>();
+        final Set<DistributionSetIdName> distributionIdNameSet = new HashSet<>();
 
         if (!distSelected.contains(transferable.getData(SPUIDefinitions.ITEMID))) {
             distributionIdNameSet.add((DistributionSetIdName) transferable.getData(SPUIDefinitions.ITEMID));
@@ -477,15 +355,6 @@ public class DeleteActionsLayout extends AbstractDeleteActionsLayout {
         return false;
     }
 
-    /**
-     * Prepare deleted target list.
-     * 
-     * @param sourceTable
-     *            {@link TargetTable}
-     * @param transferable
-     *            {@link TableTransferable}
-     * 
-     */
     private void addInDeleteTargetList(final Table sourceTable, final TableTransferable transferable) {
         final Set<TargetIdName> targetSelected = HawkbitCommonUtil.getSelectedTargetDetails(sourceTable);
 
@@ -521,9 +390,6 @@ public class DeleteActionsLayout extends AbstractDeleteActionsLayout {
         }
     }
 
-    /**
-     * Update the software module delete count.
-     */
     private void updateActionCount() {
         final int count = managementUIState.getDeletedTargetList().size()
                 + managementUIState.getDeletedDistributionList().size() + managementUIState.getAssignedList().size();
@@ -546,34 +412,16 @@ public class DeleteActionsLayout extends AbstractDeleteActionsLayout {
         return true;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.ui.common.footer.AbstractDeleteActionsLayout#
-     * hasBulkUploadPermission()
-     */
     @Override
     protected boolean hasBulkUploadPermission() {
         return permChecker.hasCreateTargetPermission();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.ui.common.footer.AbstractDeleteActionsLayout#
-     * showBulkUploadWindow()
-     */
     @Override
     protected void showBulkUploadWindow() {
         eventBus.publish(this, BulkUploadPopupEvent.MAXIMIMIZED);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.ui.common.footer.AbstractDeleteActionsLayout#
-     * restoreBulkUploadStatusCount()
-     */
     @Override
     protected void restoreBulkUploadStatusCount() {
         final Long failedCount = managementUIState.getTargetTableFilters().getBulkUpload().getFailedUploadCount();

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/state/DistributionTableFilters.java

@@ -33,9 +33,9 @@ public class DistributionTableFilters implements Serializable {
 
     private String pinnedTargetId;
 
-    private final List<String> distSetTags = new ArrayList<String>();
+    private final List<String> distSetTags = new ArrayList<>();
 
-    private List<String> clickedDistSetTags = new ArrayList<String>();
+    private List<String> clickedDistSetTags = new ArrayList<>();
 
     private Boolean noTagSelected = Boolean.FALSE;
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/state/TargetFilterParameters.java

@@ -30,9 +30,9 @@ public class TargetFilterParameters implements Serializable {
 
     private String searchText;
 
-    private final List<TargetUpdateStatus> status = new ArrayList<TargetUpdateStatus>();
+    private final List<TargetUpdateStatus> status = new ArrayList<>();
 
-    private List<String> targetTags = new ArrayList<String>();
+    private List<String> targetTags = new ArrayList<>();
 
     private Long distributionSetId;
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/state/TargetTableFilters.java

@@ -22,9 +22,6 @@ import com.vaadin.spring.annotation.VaadinSessionScope;
 
 /**
  * Target Table Filters.
- * 
- *
- *
  */
 @VaadinSessionScope
 @SpringComponent
@@ -32,8 +29,8 @@ public class TargetTableFilters implements Serializable {
 
     private static final long serialVersionUID = -5251492630546463593L;
 
-    private final List<String> clickedTargetTags = new ArrayList<String>();
+    private final List<String> clickedTargetTags = new ArrayList<>();
-    private final List<TargetUpdateStatus> clickedStatusTargetTags = new ArrayList<TargetUpdateStatus>();
+    private final List<TargetUpdateStatus> clickedStatusTargetTags = new ArrayList<>();
     private String searchText;
     private DistributionSetIdName distributionSet;
     private Long pinnedDistId;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBeanQuery.java

@@ -39,10 +39,6 @@ import com.google.common.base.Strings;
  * Simple implementation of generics bean query which dynamically loads a batch
  * of beans.
  *
- *
- *
- *
- *
  */
 public class TargetBeanQuery extends AbstractBeanQuery<ProxyTarget> {
     private static final long serialVersionUID = -5645680058303167558L;
@@ -105,7 +101,7 @@ public class TargetBeanQuery extends AbstractBeanQuery<ProxyTarget> {
     @Override
     protected List<ProxyTarget> loadBeans(final int startIndex, final int count) {
         Slice<Target> targetBeans;
-        final List<ProxyTarget> proxyTargetBeans = new ArrayList<ProxyTarget>();
+        final List<ProxyTarget> proxyTargetBeans = new ArrayList<>();
         if (pinnedDistId != null) {
             targetBeans = getTargetManagement().findTargetsAllOrderByLinkedDistributionSet(
                     new OffsetBasedPageRequest(startIndex, SPUIDefinitions.PAGE_SIZE, sort), pinnedDistId,

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java

@@ -56,9 +56,6 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * Target table header layout.
- *
- *
- *
  */
 @SpringComponent
 @ViewScope
@@ -92,9 +89,7 @@ public class TargetTableHeader extends AbstractTableHeader {
 
     private Boolean isComplexFilterViewDisplayed = Boolean.FALSE;
 
-    /**
+    @Override
-     * Initialization of Target Header Component.
-     */
     @PostConstruct
     protected void init() {
         super.init();
@@ -258,7 +253,7 @@ public class TargetTableHeader extends AbstractTableHeader {
 
     @Override
     protected void resetSearchText() {
-        if(managementUIState.getTargetTableFilters().getSearchText().isPresent()){
+        if (managementUIState.getTargetTableFilters().getSearchText().isPresent()) {
             managementUIState.getTargetTableFilters().setSearchText(null);
             eventBus.publish(this, TargetFilterEvent.REMOVE_FILTER_BY_TEXT);
         }
@@ -337,6 +332,11 @@ public class TargetTableHeader extends AbstractTableHeader {
     @Override
     protected DropHandler getDropFilterHandler() {
         return new DropHandler() {
+            /**
+             * 
+             */
+            private static final long serialVersionUID = 1L;
+
             @Override
             public void drop(final DragAndDropEvent event) {
                 filterByDroppedDist(event);
@@ -395,10 +395,9 @@ public class TargetTableHeader extends AbstractTableHeader {
     }
 
     private Set<DistributionSetIdName> getDropppedDistributionDetails(final TableTransferable transferable) {
-        @SuppressWarnings("unchecked")
         final Set<DistributionSetIdName> distSelected = HawkbitCommonUtil
                 .getSelectedDSDetails(transferable.getSourceComponent());
-        final Set<DistributionSetIdName> distributionIdSet = new HashSet<DistributionSetIdName>();
+        final Set<DistributionSetIdName> distributionIdSet = new HashSet<>();
         if (!distSelected.contains(transferable.getData("itemId"))) {
             distributionIdSet.add((DistributionSetIdName) transferable.getData("itemId"));
         } else {
@@ -443,12 +442,6 @@ public class TargetTableHeader extends AbstractTableHeader {
         eventBus.publish(this, TargetFilterEvent.REMOVE_FILTER_BY_DISTRIBUTION);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * displayFilterDropedInfoOnLoad()
-     */
     @Override
     protected void displayFilterDropedInfoOnLoad() {
         if (managementUIState.getTargetTableFilters().getDistributionSet().isPresent()) {
@@ -456,23 +449,11 @@ public class TargetTableHeader extends AbstractTableHeader {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
-     * getFilterIconStyle()
-     */
     @Override
     protected String getFilterIconStyle() {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.ui.common.table.AbstractTableHeader#
-     * isBulkUploadInProgress()
-     */
     @Override
     protected boolean isBulkUploadInProgress() {
         return managementUIState.getTargetTableFilters().getBulkUpload().getSucessfulUploadCount() != 0

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagBeanQuery.java

@@ -75,7 +75,7 @@ public class TargetTagBeanQuery extends AbstractBeanQuery<ProxyTag> {
     @Override
     protected List<ProxyTag> loadBeans(final int startIndex, final int count) {
         Page<TargetTag> targetTagBeans;
-        final List<ProxyTag> targetTagList = new ArrayList<ProxyTag>();
+        final List<ProxyTag> targetTagList = new ArrayList<>();
         if (startIndex == 0 && firstPageTargetTag != null) {
             targetTagBeans = firstPageTargetTag;
         } else {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java

@@ -57,9 +57,6 @@ import com.vaadin.ui.UI;
 
 /**
  * Target Tag filter buttons table.
- * 
- *
- * 
  */
 @SpringComponent
 @ViewScope
@@ -129,40 +126,18 @@ public class TargetTagFilterButtons extends AbstractFilterButtons {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * getButtonsTableId()
-     */
     @Override
     protected String getButtonsTableId() {
         return SPUIComponetIdProvider.TARGET_TAG_TABLE_ID;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * createButtonsLazyQueryContainer ()
-     */
     @Override
     protected LazyQueryContainer createButtonsLazyQueryContainer() {
-        final LazyQueryContainer tagContainer = HawkbitCommonUtil
+        return HawkbitCommonUtil
                 .createDSLazyQueryContainer(new BeanQueryFactory<TargetTagBeanQuery>(TargetTagBeanQuery.class));
-        return tagContainer;
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * isClickedByDefault(java.lang .Long)
-     */
     @Override
     protected boolean isClickedByDefault(final Long buttonId) {
         final TargetTag newTagClickedObj = tagMgmtService.findTargetTagById(buttonId);
@@ -175,26 +150,12 @@ public class TargetTagFilterButtons extends AbstractFilterButtons {
         return managementUIState.getTargetTableFilters().isNoTagSelected();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * createButtonId(java.lang. String)
-     */
     @Override
     protected String createButtonId(final String name) {
 
         return name;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * getFilterButtonDropHandler()
-     */
     @Override
     protected DropHandler getFilterButtonDropHandler() {
 
@@ -267,21 +228,14 @@ public class TargetTagFilterButtons extends AbstractFilterButtons {
         return true;
     }
 
-    /**
-     * Process target Drop event.
-     *
-     * @param event
-     *            DragAndDropEvent
-     */
     private void processTargetDrop(final DragAndDropEvent event) {
 
         final com.vaadin.event.dd.TargetDetails targetDetails = event.getTargetDetails();
         final TableTransferable transferable = (TableTransferable) event.getTransferable();
         final Table source = transferable.getSourceComponent();
 
-        @SuppressWarnings("unchecked")
         final Set<TargetIdName> targetSelected = HawkbitCommonUtil.getSelectedTargetDetails(source);
-        final Set<String> targetList = new HashSet<String>();
+        final Set<String> targetList = new HashSet<>();
         if (transferable.getData(ITEMID) != null) {
             if (!targetSelected.contains(transferable.getData(ITEMID))) {
                 targetList.add(((TargetIdName) transferable.getData(ITEMID)).getControllerId());
@@ -306,13 +260,6 @@ public class TargetTagFilterButtons extends AbstractFilterButtons {
         }
     }
 
-    /**
-     * validate the source tables.
-     *
-     * @param source
-     *            table
-     * @return boolean
-     */
     private boolean validateIfSourceisTargetTable(final Table source) {
         if (!source.getId().equals(SPUIComponetIdProvider.TARGET_TABLE_ID)) {
             notification.displayValidationError(i18n.get(SPUILabelDefinitions.ACTION_NOT_ALLOWED));
@@ -321,13 +268,6 @@ public class TargetTagFilterButtons extends AbstractFilterButtons {
         return true;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
-     * getButttonWrapperId()
-     */
     @Override
     protected String getButttonWrapperIdPrefix() {
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterHeader.java

@@ -25,9 +25,6 @@ import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * Target Tag filter by Tag Header.
- * 
- *
- *
  */
 @SpringComponent
 @ViewScope
@@ -50,9 +47,7 @@ public class TargetTagFilterHeader extends AbstractFilterHeader {
     @Autowired
     private ManagementUIState managementUIState;
 
-    /**
+    @Override
-     * Initialize Tag Header.
-     */
     @PostConstruct
     public void init() {
         super.init();
@@ -61,101 +56,45 @@ public class TargetTagFilterHeader extends AbstractFilterHeader {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * getHideButtonId()
-     */
     @Override
     protected String getHideButtonId() {
 
         return SPUIComponetIdProvider.HIDE_TARGET_TAGS;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * hasCreateUpdatePermission()
-     */
     @Override
     protected boolean hasCreateUpdatePermission() {
 
         return permChecker.hasCreateTargetPermission() || permChecker.hasUpdateTargetPermission();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#getTitle(
-     * )
-     */
     @Override
     protected String getTitle() {
         return i18n.get("header.target.filter.tag", new Object[] {});
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * settingsIconClicked(com.vaadin .ui.Button.ClickEvent)
-     */
     @Override
     protected void settingsIconClicked(final ClickEvent event) {
-        /**
+        // Add tag icon not displayed.
-         * Add tag icon not displayed.
-         */
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * dropHitsRequired()
-     */
     @Override
     protected boolean dropHitsRequired() {
 
         return true;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * hideFilterButtonLayout()
-     */
     @Override
     protected void hideFilterButtonLayout() {
         managementUIState.setTargetTagFilterClosed(true);
         eventbus.publish(this, ManagementUIEvent.HIDE_TARGET_TAG_LAYOUT);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
-     * getConfigureFilterButtonId()
-     */
     @Override
     protected String getConfigureFilterButtonId() {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterHeader#
-     * isAddTagRequired()
-     */
     @Override
     protected boolean isAddTagRequired() {
         return false;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/ProxyRollout.java

@@ -24,10 +24,6 @@ public class ProxyRollout extends Rollout {
 
     private String modifiedDate;
 
-    private String createdBy;
-
-    private String lastModifiedBy;
-
     private Long numberOfGroups;
 
     private Long runningTargetsCount;
@@ -106,36 +102,6 @@ public class ProxyRollout extends Rollout {
         this.modifiedDate = modifiedDate;
     }
 
-    /**
-     * @return the createdBy
-     */
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    /**
-     * @param createdBy
-     *            the createdBy to set
-     */
-    public void setCreatedBy(final String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    /**
-     * @return the lastModifiedBy
-     */
-    public String getLastModifiedBy() {
-        return lastModifiedBy;
-    }
-
-    /**
-     * @param lastModifiedBy
-     *            the lastModifiedBy to set
-     */
-    public void setLastModifiedBy(final String lastModifiedBy) {
-        this.lastModifiedBy = lastModifiedBy;
-    }
-
     /**
      * @return the runningTargetsCount
      */

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/ProxyRolloutGroup.java

@@ -22,10 +22,6 @@ public class ProxyRolloutGroup extends RolloutGroup {
 
     private String modifiedDate;
 
-    private String createdBy;
-
-    private String lastModifiedBy;
-
     private String finishedPercentage;
 
     private Long runningTargetsCount;
@@ -74,36 +70,6 @@ public class ProxyRolloutGroup extends RolloutGroup {
         this.modifiedDate = modifiedDate;
     }
 
-    /**
-     * @return the createdBy
-     */
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    /**
-     * @param createdBy
-     *            the createdBy to set
-     */
-    public void setCreatedBy(final String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    /**
-     * @return the lastModifiedBy
-     */
-    public String getLastModifiedBy() {
-        return lastModifiedBy;
-    }
-
-    /**
-     * @param lastModifiedBy
-     *            the lastModifiedBy to set
-     */
-    public void setLastModifiedBy(final String lastModifiedBy) {
-        this.lastModifiedBy = lastModifiedBy;
-    }
-
     /**
      * @return the finishedPercentage
      */

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutGroupTargetsListHeader.java

@@ -53,6 +53,7 @@ public class RolloutGroupTargetsListHeader extends AbstractSimpleTableHeader {
     private Button rolloutsGroupViewLink;
     private Label headerCaption;
 
+    @Override
     @PostConstruct
     protected void init() {
         super.init();
@@ -78,8 +79,8 @@ public class RolloutGroupTargetsListHeader extends AbstractSimpleTableHeader {
             headerCaption.setCaption(rolloutGroup.getName());
         }
 
-        rolloutsGroupViewLink.setCaption(rolloutUiState.getRolloutName().isPresent() ? rolloutUiState.getRolloutName()
+        rolloutsGroupViewLink
-                .get() : "");
+                .setCaption(rolloutUiState.getRolloutName().isPresent() ? rolloutUiState.getRolloutName().get() : "");
     }
 
     @Override
@@ -103,9 +104,7 @@ public class RolloutGroupTargetsListHeader extends AbstractSimpleTableHeader {
 
     @Override
     protected void searchBy(final String newSearchText) {
-        /**
+        // No implementation required.
-         * No implementation required.
-         */
 
     }
 
@@ -162,12 +161,6 @@ public class RolloutGroupTargetsListHeader extends AbstractSimpleTableHeader {
         return false;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.ui.rollout.AbstractSimpleTableHeader#
-     * getHeaderCaptionLayout()
-     */
     @Override
     protected HorizontalLayout getHeaderCaptionLayout() {
         headerCaption = SPUIComponentProvider.getLabel("", SPUILabelDefinitions.SP_WIDGET_CAPTION);
@@ -204,12 +197,6 @@ public class RolloutGroupTargetsListHeader extends AbstractSimpleTableHeader {
         eventBus.publish(this, RolloutEvent.SHOW_ROLLOUTS);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.ui.rollout.AbstractSimpleTableHeader#restoreCaption()
-     */
     @Override
     protected void restoreCaption() {
         setCaptionDetails();

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutGroupTargetsListTable.java

@@ -61,6 +61,7 @@ public class RolloutGroupTargetsListTable extends AbstractSimpleTable {
     @Autowired
     private transient RolloutUIState rolloutUIState;
 
+    @Override
     @PostConstruct
     protected void init() {
         super.init();
@@ -88,8 +89,8 @@ public class RolloutGroupTargetsListTable extends AbstractSimpleTable {
         columnList.add(new TableColumn(SPUILabelDefinitions.VAR_CREATED_DATE, i18n.get("header.createdDate"), 0.15f));
         columnList
                 .add(new TableColumn(SPUILabelDefinitions.VAR_LAST_MODIFIED_BY, i18n.get("header.modifiedBy"), 0.15f));
-        columnList.add(new TableColumn(SPUILabelDefinitions.VAR_LAST_MODIFIED_DATE, i18n.get("header.modifiedDate"),
+        columnList.add(
-                0.15f));
+                new TableColumn(SPUILabelDefinitions.VAR_LAST_MODIFIED_DATE, i18n.get("header.modifiedDate"), 0.15f));
         columnList.add(new TableColumn(SPUILabelDefinitions.VAR_DESC, i18n.get("header.description"), 0.15f));
 
         columnList.add(new TableColumn(SPUILabelDefinitions.VAR_TARGET_STATUS, i18n.get("header.status"), 0.1f));
@@ -101,15 +102,16 @@ public class RolloutGroupTargetsListTable extends AbstractSimpleTable {
     protected Container createContainer() {
         final BeanQueryFactory<RolloutGroupTargetsBeanQuery> rolloutgrouBeanQueryFactory = new BeanQueryFactory<>(
                 RolloutGroupTargetsBeanQuery.class);
-        return new LazyQueryContainer(new LazyQueryDefinition(true, SPUIDefinitions.PAGE_SIZE,
+        return new LazyQueryContainer(
-                SPUILabelDefinitions.VAR_ID), rolloutgrouBeanQueryFactory);
+                new LazyQueryDefinition(true, SPUIDefinitions.PAGE_SIZE, SPUILabelDefinitions.VAR_ID),
+                rolloutgrouBeanQueryFactory);
     }
 
     @Override
     protected void addContainerProperties(final Container container) {
         final LazyQueryContainer rolloutGroupTargetTableContainer = (LazyQueryContainer) container;
-        rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_CONT_ID, String.class, "",
+        rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_CONT_ID, String.class, "", false,
-                false, false);
+                false);
         rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_NAME, String.class, "", false,
                 true);
         rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_STATUS, Status.class,
@@ -124,10 +126,10 @@ public class RolloutGroupTargetsListTable extends AbstractSimpleTable {
                 false, true);
         rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_LAST_MODIFIED_BY, String.class,
                 null, false, true);
-        rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_CREATED_DATE, String.class,
+        rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_CREATED_DATE, String.class, null,
+                false, true);
+        rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_LAST_MODIFIED_DATE, String.class,
                 null, false, true);
-        rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_LAST_MODIFIED_DATE,
-                String.class, null, false, true);
         rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_DESC, String.class, "", false,
                 true);
     }
@@ -140,23 +142,20 @@ public class RolloutGroupTargetsListTable extends AbstractSimpleTable {
 
     @Override
     protected void onValueChange() {
-        /**
+        // No implementation required.
-         * No implementation required.
-         */
 
     }
 
     @Override
     protected void addCustomGeneratedColumns() {
-        addGeneratedColumn(SPUILabelDefinitions.VAR_TARGET_STATUS, (source, itemId, columnId) -> getStatusLabel(itemId));
+        addGeneratedColumn(SPUILabelDefinitions.VAR_TARGET_STATUS,
+                (source, itemId, columnId) -> getStatusLabel(itemId));
         setColumnAlignment(SPUILabelDefinitions.VAR_TARGET_STATUS, Align.CENTER);
     }
 
     @Override
     protected void setCollapsiblecolumns() {
-        /**
+        // No implementation required.
-         * No implementation required.
-         */
     }
 
     private Label getStatusLabel(final Object itemId) {
@@ -171,8 +170,8 @@ public class RolloutGroupTargetsListTable extends AbstractSimpleTable {
 
     private void setStatusIcon(final Object itemId, final Label statusLabel) {
         final Item item = getItem(itemId);
-        final RolloutGroup rolloutGroup = rolloutUIState.getRolloutGroup().isPresent() ? rolloutUIState
+        final RolloutGroup rolloutGroup = rolloutUIState.getRolloutGroup().isPresent()
-                .getRolloutGroup().get() : null;
+                ? rolloutUIState.getRolloutGroup().get() : null;
         if (item != null) {
             final Status status = (Status) item.getItemProperty(SPUILabelDefinitions.VAR_STATUS).getValue();
             if (status == null) {
@@ -184,10 +183,10 @@ public class RolloutGroupTargetsListTable extends AbstractSimpleTable {
                     statusLabel.setValue(FontAwesome.MINUS_CIRCLE.getHtml());
                     statusLabel.addStyleName("statusIconBlue");
 
-                    final String dsNameVersion = (String) item.getItemProperty(
+                    final String dsNameVersion = (String) item
-                            SPUILabelDefinitions.ASSIGNED_DISTRIBUTION_NAME_VER).getValue();
+                            .getItemProperty(SPUILabelDefinitions.ASSIGNED_DISTRIBUTION_NAME_VER).getValue();
-                    statusLabel.setDescription(i18n
+                    statusLabel
-                            .get("message.dist.already.assigned", new Object[] { dsNameVersion }));
+                            .setDescription(i18n.get("message.dist.already.assigned", new Object[] { dsNameVersion }));
                 }
             } else {
                 setRolloutStatusIcon(status, statusLabel);
@@ -197,36 +196,36 @@ public class RolloutGroupTargetsListTable extends AbstractSimpleTable {
     }
 
     private void setRolloutStatusIcon(final Status targetUpdateStatus, final Label statusLabel) {
-		switch (targetUpdateStatus) {
+        switch (targetUpdateStatus) {
-		case ERROR:
+        case ERROR:
-			statusLabel.setValue(FontAwesome.EXCLAMATION_CIRCLE.getHtml());
+            statusLabel.setValue(FontAwesome.EXCLAMATION_CIRCLE.getHtml());
-			statusLabel.addStyleName("statusIconRed");
+            statusLabel.addStyleName("statusIconRed");
-			break;
+            break;
-		case SCHEDULED:
+        case SCHEDULED:
-			statusLabel.setValue(FontAwesome.BULLSEYE.getHtml());
+            statusLabel.setValue(FontAwesome.BULLSEYE.getHtml());
-			statusLabel.addStyleName("statusIconBlue");
+            statusLabel.addStyleName("statusIconBlue");
-			break;
+            break;
-		case FINISHED:
+        case FINISHED:
-			statusLabel.setValue(FontAwesome.CHECK_CIRCLE.getHtml());
+            statusLabel.setValue(FontAwesome.CHECK_CIRCLE.getHtml());
-			statusLabel.addStyleName("statusIconGreen");
+            statusLabel.addStyleName("statusIconGreen");
-			break;
+            break;
-		case RUNNING:
+        case RUNNING:
-		case RETRIEVED:
+        case RETRIEVED:
-		case WARNING:
+        case WARNING:
-		case DOWNLOAD:
+        case DOWNLOAD:
-			statusLabel.setValue(FontAwesome.ADJUST.getHtml());
+            statusLabel.setValue(FontAwesome.ADJUST.getHtml());
-			statusLabel.addStyleName("statusIconYellow");
+            statusLabel.addStyleName("statusIconYellow");
-			break;
+            break;
-		case CANCELED:
+        case CANCELED:
-			statusLabel.setValue(FontAwesome.TIMES_CIRCLE.getHtml());
+            statusLabel.setValue(FontAwesome.TIMES_CIRCLE.getHtml());
-			statusLabel.addStyleName("statusIconGreen");
+            statusLabel.addStyleName("statusIconGreen");
-			break;
+            break;
-		case CANCELING:
+        case CANCELING:
-			statusLabel.setValue(FontAwesome.TIMES_CIRCLE.getHtml());
+            statusLabel.setValue(FontAwesome.TIMES_CIRCLE.getHtml());
-			statusLabel.addStyleName("statusIconPending");
+            statusLabel.addStyleName("statusIconPending");
-			break;
+            break;
-		default:
+        default:
-			break;
+            break;
-		}
+        }
     }
 }

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutGroupsListHeader.java

@@ -52,6 +52,7 @@ public class RolloutGroupsListHeader extends AbstractSimpleTableHeader {
 
     private Label headerCaption;
 
+    @Override
     @PostConstruct
     protected void init() {
         super.init();
@@ -71,54 +72,42 @@ public class RolloutGroupsListHeader extends AbstractSimpleTableHeader {
     }
 
     private void setCaptionDetails() {
-        headerCaption.setCaption(rolloutUiState.getRolloutName().isPresent() ? rolloutUiState.getRolloutName().get()
+        headerCaption
-                : "");
+                .setCaption(rolloutUiState.getRolloutName().isPresent() ? rolloutUiState.getRolloutName().get() : "");
     }
 
     @Override
     protected void resetSearchText() {
-        /**
+        // No implementation required.
-         * No implementation required.
-         */
     }
 
     @Override
     protected String getSearchBoxId() {
-        /**
+        // No implementation required.
-         * No implementation required.
-         */
         return null;
     }
 
     @Override
     protected String getSearchRestIconId() {
-        /**
+        // No implementation required.
-         * No implementation required.
-         */
         return null;
     }
 
     @Override
     protected void searchBy(final String newSearchText) {
-        /**
+        // No implementation required.
-         * No implementation required.
-         */
 
     }
 
     @Override
     protected String getAddIconId() {
-        /**
+        // No implementation required.
-         * No implementation required.
-         */
         return null;
     }
 
     @Override
     protected void addNewItem(final ClickEvent event) {
-        /**
+        // No implementation required.
-         * No implementation required.
-         */
     }
 
     @Override
@@ -129,7 +118,6 @@ public class RolloutGroupsListHeader extends AbstractSimpleTableHeader {
 
     @Override
     protected boolean hasCreatePermission() {
-
         return true;
     }
 
@@ -140,7 +128,6 @@ public class RolloutGroupsListHeader extends AbstractSimpleTableHeader {
 
     @Override
     protected boolean showCloseButton() {
-
         return true;
     }
 
@@ -159,12 +146,6 @@ public class RolloutGroupsListHeader extends AbstractSimpleTableHeader {
         return false;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.ui.rollout.AbstractSimpleTableHeader#
-     * getHeaderCaptionLayout()
-     */
     @Override
     protected HorizontalLayout getHeaderCaptionLayout() {
         headerCaption = SPUIComponentProvider.getLabel("", SPUILabelDefinitions.SP_WIDGET_CAPTION);
@@ -184,12 +165,6 @@ public class RolloutGroupsListHeader extends AbstractSimpleTableHeader {
         return headerCaptionLayout;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.ui.rollout.AbstractSimpleTableHeader#restoreCaption()
-     */
     @Override
     protected void restoreCaption() {
         setCaptionDetails();

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutListHeader.java

@@ -50,9 +50,7 @@ public class RolloutListHeader extends AbstractSimpleTableHeader {
     @Autowired
     private AddUpdateRolloutWindowLayout addUpdateRolloutWindow;
 
-    /**
+    @Override
-     * Initialization of Target Header Component.
-     */
     @PostConstruct
     protected void init() {
         super.init();
@@ -101,9 +99,7 @@ public class RolloutListHeader extends AbstractSimpleTableHeader {
 
     @Override
     protected void onClose(final ClickEvent event) {
-        /**
+        // No implementation required.
-         * No implementation required.
-         */
     }
 
     @Override
@@ -133,16 +129,9 @@ public class RolloutListHeader extends AbstractSimpleTableHeader {
 
     @Override
     protected boolean isRollout() {
-
         return true;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.ui.rollout.AbstractSimpleTableHeader#
-     * getHeaderCaptionLayout()
-     */
     @Override
     protected HorizontalLayout getHeaderCaptionLayout() {
         final Label headerCaption = SPUIComponentProvider.getLabel(getHeaderCaption(),
@@ -153,17 +142,9 @@ public class RolloutListHeader extends AbstractSimpleTableHeader {
         return headerCaptionLayout;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.hawkbit.ui.rollout.AbstractSimpleTableHeader#restoreCaption()
-     */
     @Override
     protected void restoreCaption() {
-        /**
+        // No implementation required.
-         * No implementation required.
-         */
     }
 
 }