From bd382c372501215a8e942bad6e7cc84044fc28d7 Mon Sep 17 00:00:00 2001
From: Ammar Bikic <ammar.bikic@bosch.io>
Date: Thu, 15 Oct 2020 11:45:08 +0200
Subject: [PATCH] Adaptations due to PR comments

Signed-off-by: Ammar Bikic <ammar.bikic@bosch.io>
---
 .../main/java/org/eclipse/hawkbit/repository/Identifiable.java | 3 +++
 .../org/eclipse/hawkbit/rest/AbstractRestIntegrationTest.java  | 1 +
 .../src/test/java/org/eclipse/hawkbit/app/CorsTest.java        | 1 -
 pom.xml                                                        | 2 --
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/Identifiable.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/Identifiable.java
index 6c6ce7552..a2e71a32b 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/Identifiable.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/Identifiable.java
@@ -10,6 +10,9 @@ package org.eclipse.hawkbit.repository;
 
 import java.io.Serializable;
 
+/**
+ * @param <T> the parameter of the class
+ */
 @FunctionalInterface
 public interface Identifiable<T extends Serializable> {
 
diff --git a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/AbstractRestIntegrationTest.java b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/AbstractRestIntegrationTest.java
index d55d864a3..d95273c5d 100644
--- a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/AbstractRestIntegrationTest.java
+++ b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/AbstractRestIntegrationTest.java
@@ -55,6 +55,7 @@ public abstract class AbstractRestIntegrationTest extends AbstractIntegrationTes
     protected DefaultMockMvcBuilder createMvcWebAppContext(final WebApplicationContext context) {
         final DefaultMockMvcBuilder createMvcWebAppContext = MockMvcBuilders.webAppContextSetup(context);
 
+        // CharacterEncodingFilter is needed for the encoding properties to be imported properly
         createMvcWebAppContext.addFilter(characterEncodingFilter);
         createMvcWebAppContext.addFilter(
                 new ExcludePathAwareShallowETagFilter("/rest/v1/softwaremodules/{smId}/artifacts/{artId}/download",
diff --git a/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/CorsTest.java b/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/CorsTest.java
index 3b877340d..7dd67eb55 100644
--- a/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/CorsTest.java
+++ b/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/CorsTest.java
@@ -41,7 +41,6 @@ import io.qameta.allure.Story;
         "hawkbit.server.security.cors.allowedOrigins=" + CorsTest.ALLOWED_ORIGIN_FIRST + "," + CorsTest.ALLOWED_ORIGIN_SECOND})
 @TestExecutionListeners(listeners = { MySqlTestDatabase.class, MsSqlTestDatabase.class },
         mergeMode = MergeMode.MERGE_WITH_DEFAULTS)
-@DirtiesContext
 @Feature("Integration Test - Security")
 @Story("CORS")
 public class CorsTest {
diff --git a/pom.xml b/pom.xml
index 9c0828049..d99195dde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,8 +150,6 @@
       <vaadin.spring.version>3.2.1</vaadin.spring.version>
       <vaadin.spring.addon.version>2.0.0.RELEASE</vaadin.spring.addon.version>
       <vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
-      <vaadin.addon.vaadin-lazyquerycontainer.version>7.6.1.3</vaadin.addon.vaadin-lazyquerycontainer.version>
-      <vaadin.addon.flexibleoptiongroup.version>2.2.0</vaadin.addon.flexibleoptiongroup.version>
       <vaadin.addon.dbar-addon.version>3.0.1</vaadin.addon.dbar-addon.version>
       <vaadin.gwt-api.version>1.3.0</vaadin.gwt-api.version>
       <vaadin.gwt-user.version>2.8.2</vaadin.gwt-user.version>